[svn-commits] pabelanger: branch pabelanger/non-root r262052 - in /team/pabelanger/non-root...

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Fri May  7 22:04:21 2010
New Revision: 262052

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262052
Log:
More update for $(INSTALL)

Modified:
    team/pabelanger/non-root/Makefile
    team/pabelanger/non-root/agi/Makefile

Modified: team/pabelanger/non-root/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/Makefile?view=diff&rev=262052&r1=262051&r2=262052
==============================================================================
--- team/pabelanger/non-root/Makefile (original)
+++ team/pabelanger/non-root/Makefile Fri May  7 22:04:21 2010
@@ -501,6 +501,7 @@
 # Should static HTTP be installed during make samples or even with its own target ala
 # webvoicemail?  There are portions here that *could* be customized but might also be
 # improved a lot.  I'll put it here for now.
+	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/static-http
 	for x in static-http/*; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
@@ -567,6 +568,7 @@
 	$(INSTALL) -d $(DESTDIR)$(ASTETCDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTBINDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTVARRUNDIR)
+	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail
 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/dictate
 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/system
@@ -580,8 +582,9 @@
 	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
-		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
-		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe.tmp ; \
+		$(INSTALL) -c -m 755 contrib/scripts/safe.tmp $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ; \
+		rm -f contrib/scripts/safe.tmp ; \
 	fi
 	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)/doxygen
@@ -591,12 +594,14 @@
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/documentation
-	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
+	$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 	$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)/cel-csv
 	$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)/cel-custom
+	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)
+	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/documentation
+	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
 	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/firmware
 	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/firmware/iax
@@ -614,7 +619,7 @@
 	fi
 
 $(SUBDIRS_INSTALL):
-	+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
+	+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install 
 
 NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
 OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))

Modified: team/pabelanger/non-root/agi/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/agi/Makefile?view=diff&rev=262052&r1=262051&r2=262052
==============================================================================
--- team/pabelanger/non-root/agi/Makefile (original)
+++ team/pabelanger/non-root/agi/Makefile Fri May  7 22:04:21 2010
@@ -40,7 +40,7 @@
 eagi-sphinx-test: eagi-sphinx-test.o
 
 install: all
-	mkdir -p $(DESTDIR)$(AGI_DIR)
+	$(INSTALL) -d $(DESTDIR)$(AGI_DIR)
 	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
 
 uninstall: