start preparing 0.9.20 release

[diogenes.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index f1c4e06..b302d90 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
-# definitions
-SCRIPTDIR := usr/share/diogenes/scripts
-
 # documentation
 DEB_INSTALL_DOCS_ALL :=
 DEB_INSTALL_DOCS_diogenes := AUTHORS README
@@ -21,20 +18,21 @@ DEB_INSTALL_DIRS_diogenes := etc/diogenes var/lib/diogenes var/spool/diogenes/te
 binary-install/diogenes::
        # config
        dh_install -pdiogenes debian/diogenes.debian.inc.php \
-                             debian/diogenes.config.inc.php \
-                             config/apache.conf \
-                             usr/share/diogenes/config
+               debian/diogenes.config.inc.php \
+               config/apache.conf \
+               usr/share/diogenes/config
        
-       # files for db installation
-       dh_install -pdiogenes config/updatedb.php $(SCRIPTDIR)
-       cat debian/prefix.sql config/db/diogenes.sql > debian/diogenes/$(SCRIPTDIR)/diogenes.tables.sql.in
-       cat debian/prefix.sql config/db/diogenes.logactions.sql > debian/diogenes/$(SCRIPTDIR)/diogenes.logactions.sql.in
-
        # PHP files, templates, locales et al.
        dh_install -X.svn -pdiogenes -Xdiogenes.globals.inc.php.in \
-                              cvs.pl \
-                              htdocs include locale plugins styles templates \
-                              usr/share/diogenes
+               cvs.pl \
+               htdocs include locale plugins scripts styles templates \
+               usr/share/diogenes
+       
+       # files for db installation
+       cat debian/prefix.sql config/db/diogenes.sql \
+         > debian/diogenes/usr/share/diogenes/scripts/diogenes.tables.sql.in
+       cat debian/prefix.sql config/db/diogenes.logactions.sql \
+         > debian/diogenes/usr/share/diogenes/scripts/diogenes.logactions.sql.in
        
        # remove library files
        rm -rf debian/diogenes/usr/share/diogenes/include/diogenes