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

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Jul 14 20:31:16 CDT 2010


Author: pabelanger
Date: Wed Jul 14 20:31:12 2010
New Revision: 276612

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276612
Log:
Remove existing directory checks. Formatting changes

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=276612&r1=276611&r2=276612
==============================================================================
--- team/pabelanger/non-root/Makefile (original)
+++ team/pabelanger/non-root/Makefile Wed Jul 14 20:31:12 2010
@@ -507,10 +507,10 @@
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
 	done
 	if [ -d doc/tex/asterisk ] ; then \
-			$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
-			for n in doc/tex/asterisk/* ; do \
-				$(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
-			done \
+		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+		for n in doc/tex/asterisk/* ; do \
+			$(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+		done \
 	fi
 	for x in images/*.jpg; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
@@ -561,90 +561,34 @@
 OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 
 installdirs:
-	@if [ ! -d "$(DESTDIR)$(MODULES_DIR)" ]; then \
-		$(INSTALL) -d $(DESTDIR)$(MODULES_DIR) ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTSBINDIR)" ]; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTSBINDIR) ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTETCDIR)" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTETCDIR) ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTVARRUNDIR)" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTVARRUNDIR) ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTSPOOLDIR)" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR) ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/dictate ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTSPOOLDIR)/system" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/system ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/tmp ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/meetme ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/monitor ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTHEADERDIR)" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTHEADERDIR)/doxygen" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)/doxygen ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTLOGDIR)" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR) ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTLOGDIR)/cdr-csv" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)/cdr-csv ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTLOGDIR)/cdr-custom" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)/cdr-custom ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTLOGDIR)/cel-csv" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)/cel-csv ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTLOGDIR)/cel-custom" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTLOGDIR)/cel-custom ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTDATADIR)" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR) ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTDATADIR)/documentation" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/documentation ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTDATADIR)/documentation/thirdparty" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTDATADIR)/keys" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/keys ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTDATADIR)/firmware" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/firmware ; \
-	fi
-	@if [ ! -d "$(DESTDIR)$(ASTDATADIR)/firmware/iax" ] ; then \
-		$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/firmware/iax ; \
-	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
+	$(INSTALL) -d $(DESTDIR)$(MODULES_DIR)
+	$(INSTALL) -d $(DESTDIR)$(ASTSBINDIR)
+	$(INSTALL) -d $(DESTDIR)$(ASTETCDIR)
+	$(INSTALL) -d $(DESTDIR)$(ASTVARRUNDIR)
+	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)
+	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/dictate
+	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/system
+	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/tmp
+	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/meetme
+	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/monitor
+	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)/doxygen
+	$(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
+	$(INSTALL) -d $(DESTDIR)$(ASTMANDIR)/man8
+	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/static-http
+	$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/images
+	$(INSTALL) -d $(DESTDIR)$(AGI_DIR)
 
 bininstall: _all installdirs $(SUBDIRS_INSTALL)
 	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
@@ -753,7 +697,6 @@
 
 samples: adsi
 	@echo Installing other config files...
-	$(INSTALL) -d $(DESTDIR)$(ASTETCDIR)
 	@for x in configs/*.sample; do \
 		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;	\
 		if [ -f $${dst} ]; then \




More information about the asterisk-commits mailing list