Changeset 220

Timestamp:

01/16/12 16:45:53 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix s.l.o.w "make install" - apparently there's a ~0.1s startup cost for
/usr/bin/install, so "for i in <list>; install $i <destdir>/path/$i" can
be significantly slower than "mkdir -p <path>; install <list> <destdir>/path"
for more than a handful of files.

Also make some mostly cosmetic fixes in Makefile variable expansion so we
don't accidentally end up with quotes embedded in some of the pathnames.

File:

• trunk/Makefile (modified) (3 diffs)

trunk/Makefile

@@ -19 +19 @@
 mandir = ${prefix}/man
 
-INSTALL = /usr/bin/install -c
+INSTALL = /usr/bin/install
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
@@ -34 +34 @@
 
 # also set the leaf directories we'll be putting things in
-PKG_LEAF = "dnsdb"
-CFG_LEAF = "dnsdb"
+PKG_LEAF = dnsdb
+CFG_LEAF = dnsdb
 
 # tweak the final leaf directories we install to if PARA_VERSIONS is set
 ifeq "$(PARA_VERSIONS)" "1"
-PKG_LEAF = "dnsdb-$(VERSION)"
-CFG_LEAF = "dnsdb/$(VERSION)"
+PKG_LEAF = dnsdb-$(VERSION)
+CFG_LEAF = dnsdb/$(VERSION)
 endif
 
@@ -98 +98 @@
 
 install:
-        @for i in $(IMAGES) $(TEMPLATES); do \
-                $(INSTALL_DATA) -D $$i $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
-        done
+        @mkdir -p $(DESTDIR)${datadir}/$(PKG_LEAF)/images
+        @$(INSTALL_DATA) $(IMAGES) $(DESTDIR)${datadir}/$(PKG_LEAF)/images
+        @mkdir -p $(DESTDIR)${datadir}/$(PKG_LEAF)/templates
+        @$(INSTALL_DATA) $(TEMPLATES) $(DESTDIR)${datadir}/$(PKG_LEAF)/templates
         @# munge in necessary 'use lib ...' bits so scripts can find libs and config...
         @# datadir is correct;  no arch-specific files