From 3babb2137fe5afd446b009d577fb7c3f14ae9da2 Mon Sep 17 00:00:00 2001 From: znek Date: Mon, 7 Jun 2004 10:51:59 +0000 Subject: [PATCH] ZideStore/install hooks This line, and those below, will be ignored-- M UI-X/ChangeLog M UI-X/Scheduler/GNUmakefile M UI-X/Scheduler/GNUmakefile.postamble git-svn-id: http://svn.opengroupware.org/SOGo/trunk@14 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ZideStore/UI-X/ChangeLog | 8 ++++++++ ZideStore/UI-X/Scheduler/GNUmakefile | 12 +----------- ZideStore/UI-X/Scheduler/GNUmakefile.postamble | 7 +++++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog index ef4e0e42..ae79b083 100644 --- a/ZideStore/UI-X/ChangeLog +++ b/ZideStore/UI-X/ChangeLog @@ -1,3 +1,11 @@ +2004-06-07 Marcus Mueller + + * Scheduler/GNUmakefile: changed ZIDESTORE to include installed version + (ZideStore12). Removed post install hooks. + + * Scheduler/GNUmakefile.postamble: post install hooks updated for + GNUSTEP_BUILD_DIR. + 2004-06-03 Helge Hess * Scheduler/OGoCalWeekOverview.m: moved navigation URL generation to diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile b/ZideStore/UI-X/Scheduler/GNUmakefile index 05cd3b95..750bbb08 100644 --- a/ZideStore/UI-X/Scheduler/GNUmakefile +++ b/ZideStore/UI-X/Scheduler/GNUmakefile @@ -30,7 +30,7 @@ SchedulerUI_RESOURCE_FILES += \ images/next_week.gif \ images/previous_week.gif \ -ZIDESTORE=../.. +ZIDESTORE=$(GNUSTEP_USER_ROOT)/Headers/ZideStore12 ADDITIONAL_INCLUDE_DIRS += \ -I. \ @@ -41,13 +41,3 @@ ADDITIONAL_INCLUDE_DIRS += \ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble - -ifneq ($(GNUSTEP_BUILD_DIR),) -after-all :: - @(cp bundle-info.plist \ - $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION)) -else -after-all :: - @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\ - cp ../bundle-info.plist .) -endif diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile.postamble b/ZideStore/UI-X/Scheduler/GNUmakefile.postamble index 6e5a7f2a..3986bcce 100644 --- a/ZideStore/UI-X/Scheduler/GNUmakefile.postamble +++ b/ZideStore/UI-X/Scheduler/GNUmakefile.postamble @@ -5,6 +5,13 @@ validate-wox: before-all :: validate-wox + +ifneq ($(GNUSTEP_BUILD_DIR),) +after-all :: + @(cp bundle-info.plist \ + $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION)) +else after-all :: @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\ cp ../bundle-info.plist .) +endif -- 2.39.5