Changeset 548 for branches/stable/Makefile

Timestamp:

12/11/13 16:01:18 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS work and object conversion from /trunk, part 5

Includes changes through r543 with a few more minor conflicts.

Location:

branches/stable

Files:

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

branches/stable/Makefile

@@ -46 +46 @@
         INSTALL COPYING TODO Makefile dnsadmin.spec \
         \
-        new-dns.sql dns.sql dns.cgi dns-rpc.cgi textrecs.cgi DNSDB.pm vega-import.pl export.pl \
+        dns.sql dns-1.0-1.2.sql \
+        \
+        $(SCRIPTS) $(MODULES) \
         \
         index.shtml \
         \
-        images/trash2.png images/fwd.png images/ffwd.png images/frev.png \
-        images/rev.png images/DESC.png images/ASC.png images/tree_open.png images/tree_closed.png \
+        $(IMAGES) \
         \
-        templates/adddomain.tmpl templates/addgroup.tmpl templates/addrec.tmpl templates/adduser.tmpl \
-        templates/axfr.tmpl templates/bulkchange.tmpl templates/bulkdomain.tmpl templates/dberr.tmpl \
-        templates/deldom.tmpl templates/delgrp.tmpl templates/delloc.tmpl templates/delrec.tmpl \
-        templates/delrevzone.tmpl templates/deluser.tmpl \
-        templates/dns.css templates/dnsq.tmpl templates/domlist.tmpl templates/edgroup.tmpl \
-        templates/editsoa.tmpl templates/footer.tmpl templates/fpnla.tmpl templates/grouptree.css \
-        templates/grouptree-ie.css templates/grpman.tmpl templates/grptree.tmpl templates/header.tmpl \
-        templates/lettsearch.tmpl templates/login.tmpl templates/log.tmpl templates/menu.tmpl \
-        templates/newdomain.tmpl templates/newgrp.tmpl templates/permlist_enabled.tmpl templates/permlist.tmpl \
-        templates/pgcount.tmpl templates/reclist.tmpl templates/record.tmpl templates/sbox.tmpl \
-        templates/soadata.tmpl templates/template.tmpl templates/textrecs.tmpl templates/updatesoa.tmpl \
-        templates/useradmin.tmpl templates/user.tmpl templates/whoisq.tmpl \
+        $(TEMPLATES) \
         \
         dnsdb.conf
@@ -72 +62 @@
 
 IMAGES = \
-        images/trash2.png images/fwd.png images/ffwd.png images/frev.png \
-        images/rev.png images/DESC.png images/ASC.png
+        images/ASC.png images/DESC.png \
+        images/ffwd.png images/frev.png images/fwd.png images/rev.png \
+        images/trash2.png \
+        images/tree_closed.png images/tree_open.png
 
 SCRIPTS = \
-        dns.cgi dns-rpc.cgi textrecs.cgi vega-import.pl export.pl
+        compact-recs.pl dns.cgi dns-rpc.cgi export.pl textrecs.cgi tiny-import.pl vega-import.pl
 
 MODULES = DNSDB.pm
 
 TEMPLATES = \
-        templates/adddomain.tmpl templates/addgroup.tmpl templates/addrec.tmpl templates/adduser.tmpl \
-        templates/axfr.tmpl templates/bulkchange.tmpl templates/bulkdomain.tmpl templates/dberr.tmpl \
-        templates/deldom.tmpl templates/delgrp.tmpl templates/delloc.tmpl templates/delrec.tmpl \
-        templates/delrevzone.tmpl templates/deluser.tmpl \
+        templates/adddomain.tmpl templates/addgroup.tmpl templates/addrec.tmpl templates/addrevzone.tmpl \
+        templates/adduser.tmpl templates/axfr.tmpl templates/badpage.tmpl templates/bulkchange.tmpl \
+        templates/bulkdomain.tmpl templates/dberr.tmpl templates/deldom.tmpl templates/delgrp.tmpl \
+        templates/delloc.tmpl templates/delrec.tmpl templates/delrevzone.tmpl templates/deluser.tmpl \
         templates/dns.css templates/dnsq.tmpl templates/domlist.tmpl templates/edgroup.tmpl \
         templates/editsoa.tmpl templates/footer.tmpl templates/fpnla.tmpl templates/grouptree.css \
         templates/grouptree-ie.css templates/grpman.tmpl templates/grptree.tmpl templates/header.tmpl \
-        templates/lettsearch.tmpl templates/login.tmpl templates/log.tmpl templates/menu.tmpl \
-        templates/newdomain.tmpl templates/newgrp.tmpl templates/permlist_enabled.tmpl templates/permlist.tmpl \
-        templates/pgcount.tmpl templates/reclist.tmpl templates/record.tmpl templates/sbox.tmpl \
-        templates/soadata.tmpl templates/template.tmpl templates/textrecs.tmpl templates/updatesoa.tmpl \
-        templates/useradmin.tmpl templates/user.tmpl templates/whoisq.tmpl
+        templates/lettsearch.tmpl templates/location.tmpl templates/loclist.tmpl templates/login.tmpl \
+        templates/log.tmpl templates/menu.tmpl templates/msgblock.tmpl templates/newdomain.tmpl \
+        templates/newgrp.tmpl templates/newrevzone.tmpl templates/permlist.tmpl \
+        templates/pgcount.tmpl templates/reclist.tmpl templates/record.tmpl templates/revzones.tmpl \
+        templates/sbox.tmpl templates/soadata.tmpl templates/template.tmpl templates/textrecs.tmpl \
+        templates/updatesoa.tmpl templates/useradmin.tmpl templates/user.tmpl templates/whoisq.tmpl
 
 CONFIGFILES = dnsdb.conf
@@ -108 +101 @@
         @for i in $(SCRIPTS) $(MODULES); do \
                 $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
-                perl -pi -e 's|use lib '.';     ##uselib##|use lib "${datadir}/$(PKG_LEAF)/";|;' $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
-                perl -pi -e 's|use lib '.';     ##uselib##|use lib "${datadir}/$(PKG_LEAF)/";|;' $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
+                perl -pi -e "s|use lib '.';\s+##uselib##|use lib '${datadir}/$(PKG_LEAF)/';|;" $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
         done
         @$(INSTALL) -d $(DESTDIR)${sysconfdir}/$(CFG_LEAF)/
@@ -120 +112 @@
                         $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/$(CFG_LEAF)/ ; \
                 fi ; \
-                perl -pi -e 's|"/etc/dnsdb";    ##CFG_LEAF##|"${sysconfdir}/$(CFG_LEAF)";|;' $(DESTDIR)${datadir}/$(PKG_LEAF)/DNSDB.pm ; \
+                perl -pi -e 's|"/etc/dnsdb/dnsdb.conf",\s+##CFG_LEAF##|"${sysconfdir}/$(CFG_LEAF)/dnsdb.conf",|;' $(DESTDIR)${datadir}/$(PKG_LEAF)/DNSDB.pm ; \
         done
-#       # and now munge MyDNSDB.pm so it can find the core library
-#       perl -pi -e 's|##uselib##|use lib "${libdir}/dnsdb";|;' $(DESTDIR)${sysconfdir}/dnsdb/MyDNSDB.pm
 
 #clean: