Changeset 593 for branches/stable/Makefile

Timestamp:

05/14/13 18:10:22 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk r517 (merge /branches/htmlform)
Conflicts all resolved towards /trunk.
Fix a minor syntax error with "while (@data..." -> "while (my @data..."
(may cause merge conflicts later)

Location:

branches/stable

Files:

• . (modified) (1 prop)
• Makefile (modified) (3 diffs)

branches/stable/Makefile

@@ -28 +28 @@
 DESTDIR =
 
-MANIFEST = \
-        INSTALL COPYING Makefile ipdb.spec \
-        \
-        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 \
-        newcity.html newnode.html nodesearch.html startsn.html updated.html \
-        images/logo.png \
-        \
-        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/snCalc.cgi cgi-bin/CommonWeb.pm cgi-bin/ipdb.psql \
-        cgi-bin/consistency-check.pl \
-        \
-        cgi-bin/extras/db2rwhois.pl cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
-        cgi-bin/extras/network.tmpl
+HTML = \
+        alloctypes.html help.html index.shtml ipdb.css
 
-HTML = \
-        addmaster.html alloctypes.html assign.html changes.html compsearch.html \
-        confirm.html confirmRemove.html editDisplay.html fb-assign.html footer.inc \
-        header.inc help.html index.shtml ipdb.css \
-        newcity.html newnode.html nodesearch.html startsn.html updated.html
+JS = templates/widgets.js
 
 IMAGES = images/logo.png
+
+TEMPLATES = \
+        templates/aclerror.tmpl templates/addmaster.tmpl templates/assign.tmpl templates/confirm.tmpl \
+        templates/dberr.tmpl templates/delete.tmpl templates/dunno.tmpl templates/edit.tmpl \
+        templates/finaldelete.tmpl templates/footer.tmpl templates/header.tmpl templates/index.tmpl \
+        templates/insert.tmpl templates/listpool.tmpl templates/newcity.tmpl templates/newmaster.tmpl \
+        templates/newnode.tmpl templates/nodesearch.tmpl templates/showmaster.tmpl templates/showrouted.tmpl \
+        templates/subnet-calc.tmpl templates/update.tmpl \
+        \
+        templates/admin/aclerr.tmpl templates/admin/addnotice.tmpl templates/admin/alloc.tmpl \
+        templates/admin/alloctweak.tmpl templates/admin/confirm.tmpl templates/admin/dberr.tmpl \
+        templates/admin/delnotice.tmpl templates/admin/deluser.tmpl templates/admin/dunno.tmpl \
+        templates/admin/edcust.tmpl templates/admin/ednotice.tmpl templates/admin/emailnotice.tmpl \
+        templates/admin/header.tmpl templates/admin/listcust.tmpl templates/admin/main.tmpl \
+        templates/admin/newuser.tmpl templates/admin/showallocs.tmpl templates/admin/showpools.tmpl \
+        templates/admin/showusers.tmpl templates/admin/touch.tmpl templates/admin/tweakpool.tmpl \
+        templates/admin/updacl.tmpl templates/admin/updatepool.tmpl templates/admin/update.tmpl \
+        templates/admin/updcust.tmpl templates/admin/updnotice.tmpl \
+        \
+        templates/search/compsearch.tmpl templates/search/sresults.tmpl
 
 SCRIPTS = \
@@ -67 +66 @@
 
 RWHOIS = \
-        cgi-bin/extras/db2rwhois.pl cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
+        cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
         cgi-bin/extras/network.tmpl
 
-DIRS = images cgi-bin cgi-bin/extras
+DIRS = images templates cgi-bin cgi-bin/extras
 
-# hmm.  not sure what do do about you, m'friend...
-#ip@
+MANIFEST = \
+        $(HTML) \
+        $(JS) \
+        $(IMAGES) \
+        $(TEMPLATES) \
+        $(SCRIPTS) \
+        $(MODULES) \
+        $(CONFIGMODULES) \
+        $(RWHOIS)
 
 all:
@@ -79 +85 @@
 
 install:
-        @for i in $(HTML) $(IMAGES); do \
+        @for i in $(HTML) $(IMAGES) $(JS) $(TEMPLATES); do \
                 $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
         done