Changeset 516


Ignore:
Timestamp:
Oct 17, 2012, 5:19:50 PM (9 years ago)
Author:
Kris Deugau
Message:

/branches/htmlform

Update and shuffle the file listings in the Makefile to match all
the new templates. MANIFEST is now constructed from the other
lists, rather duplicating things.
Make sure "make install" actually installs all current files.
See #3.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/htmlform/Makefile

    r511 r516  
    2828DESTDIR =
    2929
    30 MANIFEST = \
    31         INSTALL COPYING Makefile ipdb.spec \
    32         \
    33         alloctypes.html \
    34         help.html index.shtml ipdb.css \
    35         images/logo.png \
    36         \
    37         cgi-bin/combineblocks.pl cgi-bin/access-pwd-update.pl \
    38         cgi-bin/newnode.cgi cgi-bin/CustIDCK.pm cgi-bin/freespace.pl \
    39         cgi-bin/admin.cgi cgi-bin/MyIPDB.pm cgi-bin/IPDB.pm \
    40         cgi-bin/main.cgi cgi-bin/checkcusts.pl cgi-bin/newcity.cgi \
    41         cgi-bin/allocate.pl cgi-bin/search.cgi \
    42         cgi-bin/snCalc.cgi cgi-bin/ipdb.psql \
    43         cgi-bin/consistency-check.pl \
    44         \
    45         cgi-bin/extras/db2rwhois.pl cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
    46         cgi-bin/extras/network.tmpl
     30HTML = \
     31        alloctypes.html help.html index.shtml ipdb.css
    4732
    48 HTML = \
    49         alloctypes.html \
    50         help.html index.shtml ipdb.css
     33JS = templates/widgets.js
    5134
    5235IMAGES = images/logo.png
     36
     37TEMPLATES = \
     38        templates/aclerror.tmpl templates/addmaster.tmpl templates/assign.tmpl templates/confirm.tmpl \
     39        templates/dberr.tmpl templates/delete.tmpl templates/dunno.tmpl templates/edit.tmpl \
     40        templates/finaldelete.tmpl templates/footer.tmpl templates/header.tmpl templates/index.tmpl \
     41        templates/insert.tmpl templates/listpool.tmpl templates/newcity.tmpl templates/newmaster.tmpl \
     42        templates/newnode.tmpl templates/nodesearch.tmpl templates/showmaster.tmpl templates/showrouted.tmpl \
     43        templates/subnet-calc.tmpl templates/update.tmpl \
     44        \
     45        templates/admin/aclerr.tmpl templates/admin/addnotice.tmpl templates/admin/alloc.tmpl \
     46        templates/admin/alloctweak.tmpl templates/admin/confirm.tmpl templates/admin/dberr.tmpl \
     47        templates/admin/delnotice.tmpl templates/admin/deluser.tmpl templates/admin/dunno.tmpl \
     48        templates/admin/edcust.tmpl templates/admin/ednotice.tmpl templates/admin/emailnotice.tmpl \
     49        templates/admin/header.tmpl templates/admin/listcust.tmpl templates/admin/main.tmpl \
     50        templates/admin/newuser.tmpl templates/admin/showallocs.tmpl templates/admin/showpools.tmpl \
     51        templates/admin/showusers.tmpl templates/admin/touch.tmpl templates/admin/tweakpool.tmpl \
     52        templates/admin/updacl.tmpl templates/admin/updatepool.tmpl templates/admin/update.tmpl \
     53        templates/admin/updcust.tmpl templates/admin/updnotice.tmpl \
     54        \
     55        templates/search/compsearch.tmpl templates/search/sresults.tmpl
    5356
    5457SCRIPTS = \
     
    6366
    6467RWHOIS = \
    65         cgi-bin/extras/db2rwhois.pl cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
     68        cgi-bin/extras/rwhois-net-skel.tar.gz cgi-bin/extras/rwhois-config \
    6669        cgi-bin/extras/network.tmpl
    6770
    68 DIRS = images cgi-bin cgi-bin/extras
     71DIRS = images templates cgi-bin cgi-bin/extras
    6972
    70 # hmm.  not sure what do do about you, m'friend...
    71 #ip@
     73MANIFEST = \
     74        $(HTML) \
     75        $(JS) \
     76        $(IMAGES) \
     77        $(TEMPLATES) \
     78        $(SCRIPTS) \
     79        $(MODULES) \
     80        $(CONFIGMODULES) \
     81        $(RWHOIS)
    7282
    7383all:
     
    7585
    7686install:
    77         @for i in $(HTML) $(IMAGES); do \
     87        @for i in $(HTML) $(IMAGES) $(JS) $(TEMPLATES); do \
    7888                $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb-$(VERSION)/$$i ; \
    7989        done
Note: See TracChangeset for help on using the changeset viewer.