[patch] fix_destinations_in_makefiles-1.5.1.patch

fix_destinations_in_makefiles-1.5.1.patch (text/plain), 2.49 KB, created by Thomas Oettli on 2011-09-07 11:42:44 UTC

--- Makefile.in	2011-09-06 12:03:44.000000000 +0200
+++ Makefile.in	2011-09-06 12:04:30.000000000 +0200
@@ -208,7 +208,7 @@
 	cd $(SRC_SITE) && $(MAKE)
 
 install-log:
-	$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(LOGDIR)
+	$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d ${DESTDIR}$(LOGDIR)
 
 install-all: install-lib install-pub install-etc install-bin install-doc install-app install-log
 
--- app/Makefile.in	2011-09-06 16:42:37.000000000 +0200
+++ app/Makefile.in	2011-09-06 16:43:04.000000000 +0200
@@ -32,6 +32,6 @@
 	$(INSTALL) -m 755 $(INSTALL_OPTS_CACHE) -d $(DESTDIR)$(prefix)/app/cache
 	$(INSTALL) -m 755 $(INSTALL_OPTS_CACHE) -d $(DESTDIR)$(prefix)/app/cache/config
 	
-	$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(LOGFOLDER)
+	$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d ${DESTDIR}$(LOGFOLDER)
 	$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/data/tmp
 	$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/modules/Reporting/data

--- etc/sitecfg/Makefile.in	2011-09-07 10:24:21.000000000 +0200
+++ etc/sitecfg/Makefile.in	2011-09-07 10:26:09.000000000 +0200
@@ -15,10 +15,10 @@
 	$(INSTALL) -m 755 $(INSTALL_OPTS) settings.site.xml $(DESTDIR)$(prefix)/app/config/settings.site.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) factories.site.xml $(DESTDIR)$(prefix)/app/config/factories.site.xml
 
-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)$(WEB_CFG_DIR)
-	$(INSTALL) -m 755 $(INSTALL_OPTS) access.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/access.xml
-	$(INSTALL) -m 755 $(INSTALL_OPTS) auth.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/auth.xml
-	$(INSTALL) -m 755 $(INSTALL_OPTS) databases.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/databases.xml
-	$(INSTALL) -m 755 $(INSTALL_OPTS) cronks.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/cronks.xml
-	$(INSTALL) -m 755 $(INSTALL_OPTS) translation.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/translation.xml
-	$(INSTALL) -m 755 $(INSTALL_OPTS) reporting.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/reporting.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)/$(WEB_CFG_DIR)
+	$(INSTALL) -m 755 $(INSTALL_OPTS) access.xml $(DESTDIR)/$(WEB_CFG_DIR)/access.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) auth.xml $(DESTDIR)/$(WEB_CFG_DIR)/auth.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) databases.xml $(DESTDIR)/$(WEB_CFG_DIR)/databases.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) cronks.xml $(DESTDIR)/$(WEB_CFG_DIR)/cronks.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) translation.xml $(DESTDIR)/$(WEB_CFG_DIR)/translation.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) reporting.xml $(DESTDIR)/$(WEB_CFG_DIR)/reporting.xml