Changeset 433 for trunk/Makefile

Timestamp:

07/16/10 17:48:19 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Distribution-preparation rollup:

• Clean up links in footer.inc
• Extend/complete INSTALL
• .spec file tweaks
• Add GPL3 as COPYING
• Remove obsoleted files from Makefile MANIFEST
• Shuffle install process to allow side-by-side multiversion installation (sort of related to #14)

File:

• trunk/Makefile (modified) (4 diffs)

trunk/Makefile

@@ -29 +29 @@
 
 MANIFEST = \
-        Makefile ipdb.spec \
+        INSTALL COPYING Makefile ipdb.spec \
         \
-        addmaster.html alloctypes.html assign.html changes.html compsearch.html \
+        addmaster.html alloctypes.html assign.html compsearch.html \
         confirm.html confirmRemove.html editDisplay.html fb-assign.html footer.inc \
         header.inc help.html index.shtml ipdb.css local.css \
@@ -37 +37 @@
         images/logo.png \
         \
-        cgi-bin/updatecust.php cgi-bin/combineblocks.pl cgi-bin/access-pwd-update.pl \
+        cgi-bin/combineblocks.pl cgi-bin/access-pwd-update.pl \
         cgi-bin/newnode.cgi cgi-bin/CustIDCK.pm cgi-bin/freespace.pl \
         cgi-bin/admin.cgi cgi-bin/MyIPDB.pm cgi-bin/IPDB.pm \
         cgi-bin/main.cgi cgi-bin/checkcusts.pl cgi-bin/newcity.cgi \
-        cgi-bin/allocate.pl cgi-bin/search.cgi cgi-bin/editcust.php \
+        cgi-bin/allocate.pl cgi-bin/search.cgi \
         cgi-bin/snCalc.cgi cgi-bin/CommonWeb.pm cgi-bin/ipdb.psql \
-        cgi-bin/list-cust.php cgi-bin/consistency-check.pl \
+        cgi-bin/consistency-check.pl \
         \
         cgi-bin/extras/db2rwhois.pl cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
@@ -80 +80 @@
 install:
         @for i in $(HTML) $(IMAGES); do \
-                $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
+                $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
         done
         # munge in necessary 'use lib ...' bits so scripts can find MyIPDB.pm...
         @for i in $(SCRIPTS) $(MODULES) $(RWHOIS); do \
-                $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
-                perl -pi -e 's|##uselib##|use lib "${sysconfdir}/ipdb/";|;' $(DESTDIR)${libdir}/ipdb/$$i ; \
+                $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
+                perl -pi -e 's|##uselib##|use lib "${sysconfdir}/ipdb-$(VERSION)/";|;' $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
         done
-        $(INSTALL) -d $(DESTDIR)${sysconfdir}/ipdb/
+        $(INSTALL) -d $(DESTDIR)${sysconfdir}/ipdb-$(VERSION)/
         @for i in $(CONFIGMODULES) ; do \
-                $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/ipdb/ ; \
+                $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/ipdb-$(VERSION)/ ; \
         done
         # and now munge MyIPDB.pm so it can find the core library
-        perl -pi -e 's|##uselib##|use lib "${libdir}/ipdb";|;' $(DESTDIR)${sysconfdir}/ipdb/MyIPDB.pm
+        perl -pi -e 's|##uselib##|use lib "${libdir}/ipdb-$(VERSION)";|;' $(DESTDIR)${sysconfdir}/ipdb-$(VERSION)/MyIPDB.pm
 
 #clean:
@@ -103 +103 @@
         tar cf - $(MANIFEST) | (cd $(PKGNAME)-$(VERSION); tar xf -)
         /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/;s/#RELEASE#/$(RELEASE)/;s/#BETA#//g' < $(PKGNAME).spec > $(PKGNAME)-$(VERSION)/$(PKGNAME).spec
+        /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/;s/#RELEASE#/$(RELEASE)/;s/#BETA#//g' < INSTALL > $(PKGNAME)-$(VERSION)/INSTALL
         perl -pi -e 's/[\d.]+;\s*##VERSION##/$(VERSION);/;' $(PKGNAME)-$(VERSION)/cgi-bin/IPDB.pm
         tar cf $(PKGNAME)-$(VERSION).tar $(PKGNAME)-$(VERSION)