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

diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog
index ef4e0e42edc2ca5194bbfbf9cff2191719fe68b8..ae79b0834b63c3e805deee9384cbdfbdc69cd79e 100644 (file)
--- a/ZideStore/UI-X/ChangeLog
+++ b/ZideStore/UI-X/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * 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  <helge.hess@opengroupware.org>
 
        * Scheduler/OGoCalWeekOverview.m: moved navigation URL generation to

diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile b/ZideStore/UI-X/Scheduler/GNUmakefile
index 05cd3b950e21823791cf8cccf079d5bc9ad1e488..750bbb08cdec75ca6f8cc4b983fa7eac89fd03bd 100644 (file)
--- 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 6e5a7f2ae146e901e697d53493d5aa5ca75e7b16..3986bcceacb69aabf4cd7707ef5d929126757677 100644 (file)
--- 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