From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 7 Jun 2004 11:05:37 +0000 (+0000)
Subject: Updated build process for Common as well
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=448090eedc6baa03a0c1b4ef976489540613ec5a;p=scalable-opengroupware.org

Updated build process for Common as well

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@16 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog
index ae79b083..49d11ebf 100644
--- a/ZideStore/UI-X/ChangeLog
+++ b/ZideStore/UI-X/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* Custom/GNUmakefile: changed ZIDESTORE to include installed version
+	  (ZideStore12). Removed post install hooks.
+
+	* Custom/GNUmakefile.postamble: new file, post install hooks and
+	  xmllint for .wox.
+
 2004-06-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* Scheduler/GNUmakefile: changed ZIDESTORE to include installed version
diff --git a/ZideStore/UI-X/Common/GNUmakefile b/ZideStore/UI-X/Common/GNUmakefile
index a5492e92..5c626ecf 100644
--- a/ZideStore/UI-X/Common/GNUmakefile
+++ b/ZideStore/UI-X/Common/GNUmakefile
@@ -27,7 +27,7 @@ CommonUI_RESOURCE_FILES += \
 	calendar.css		\
 	images/OGoLogo.gif	\
 
-ZIDESTORE=../..
+ZIDESTORE=$(GNUSTEP_USER_ROOT)/Headers/ZideStore12
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I. \
@@ -38,7 +38,3 @@ ADDITIONAL_INCLUDE_DIRS += \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-
-after-all ::
-	@(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\
-	  cp ../bundle-info.plist .)
diff --git a/ZideStore/UI-X/Common/GNUmakefile.postamble b/ZideStore/UI-X/Common/GNUmakefile.postamble
new file mode 100644
index 00000000..3986bcce
--- /dev/null
+++ b/ZideStore/UI-X/Common/GNUmakefile.postamble
@@ -0,0 +1,17 @@
+# $Id: GNUmakefile.postamble,v 1.1 2004/05/12 14:45:56 helge Exp $
+
+validate-wox:
+	xmllint --noout *.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