Changeset 20890

Timestamp:

2009-11-02T19:19:39+13:00 (14 years ago)

Author:

ak19

Message:

Don't want to do make install on apache twice.

File:

• gsdl/trunk/runtime-src/packages/Makefile.in (modified) (3 diffs)

gsdl/trunk/runtime-src/packages/Makefile.in

@@ -70 +70 @@
 # is assumed that each package will have at least four rules: all, install,
 # clean, and distclean.
-PACKAGEDIRS =   $(YAZ) $(D2M) $(CORBA)  $(HTTPD)
+INSTALLDIRS =   $(YAZ) $(D2M) $(CORBA)
+PACKAGEDIRS =   $(INSTALLDIRS) $(HTTPD)
 
 REPLACELIST = conf/extra/httpd-dav.conf \
@@ -128 +129 @@
 endif
 
+# now install everything except apache, since that had already been installed during "all"
 install:
     for idir in $(PACKAGEDIRS); do \
@@ -154 +156 @@
 
 distclean:
-    for subdir in $(PACKAGEDIRS); do \
+    for subdir in $(INSTALLDIRS); do \
           echo cleaning $@ in $$subdir; \
           (cd $$subdir && $(MAKE) distclean || exit 0) ; \