[asterisk-commits] pabelanger: branch pabelanger/non-root r275776 - /team/pabelanger/non-root/

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Mon Jul 12 16:06:55 2010
New Revision: 275776

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275776
Log:
Additional cleanup of installdirs, plus formatting.

Modified:
    team/pabelanger/non-root/Makefile

Modified: team/pabelanger/non-root/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/Makefile?view=diff&rev=275776&r1=275775&r2=275776
==============================================================================
--- team/pabelanger/non-root/Makefile (original)
+++ team/pabelanger/non-root/Makefile Mon Jul 12 16:06:55 2010
@@ -502,8 +502,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 ; \
 	done
@@ -513,11 +512,9 @@
 				$(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
 			done \
 	fi
-	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/images
 	for x in images/*.jpg; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 	done
-	$(INSTALL) -d $(DESTDIR)$(AGI_DIR)
 	$(MAKE) -C sounds install
 
 doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
@@ -638,6 +635,15 @@
 	fi
 	@if [ ! -d "$(DESTDIR)$(ASTMANDIR)/man8" ] ; then \
 		$(INSTALL) -d $(DESTDIR)$(ASTMANDIR)/man8 ; \
+	fi
+	@if [ ! -d "$(DESTDIR)$(ASTDATADIR)/static-http" ] ; then \
+		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/static-http ; \
+	fi
+	@if [ ! -d "$(DESTDIR)$(ASTDATADIR)/images" ] ; then \
+		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/images ; \
+	fi
+	@if [ ! -d "$(DESTDIR)$(AGI_DIR)" ] ; then \
+		$(INSTALL) -d $(DESTDIR)$(AGI_DIR) ; \
 	fi
 
 bininstall: _all installdirs $(SUBDIRS_INSTALL)
@@ -700,7 +706,7 @@
 	@exit 1
 endif
 
-install: badshell datafiles bininstall
+install: badshell bininstall datafiles
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -781,21 +787,19 @@
 			$(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \
 		$(INSTALL) -c -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \
 		rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
-	fi ;\
+	fi ; \
 	if [ "$(AST_USER)" ] ; then \
-		sed \
-			-e 's|^;runuser = asterisk.*$$|runuser = $(AST_USER)|'\
+		sed -e 's|^;runuser = asterisk.*$$|runuser = $(AST_USER)|' \
                         $(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \
                 $(INSTALL) -c -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \
                 rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
-	fi ;\
+	fi ; \
 	if [ "$(AST_GROUP)" ] ; then \
-		sed \
-			-e 's|^;rungroup = asterisk.*$$|rungroup = $(AST_GROUP)|'\
+		sed -e 's|^;rungroup = asterisk.*$$|rungroup = $(AST_GROUP)|' \
                         $(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \
                 $(INSTALL) -c -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \
                 rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
-	fi ;\
+	fi ; \
 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/phoneprov