diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+WEB_DIR = debian/mlmmj-php-web/usr/share/mlmmj-php-web/www
+WEB_ADMIN_DIR = debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/www
+
include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# Don't advertise that mlmmj-make-ml is a shell script
# And install our own version of mlmmj-make-ml, until upstream
# has stabilised somewhat
- rm -f $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml.sh
- install -m 755 -D $(CURDIR)/debian/mlmmj-make-ml \
- $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml
+ rm -f debian/mlmmj/usr/bin/mlmmj-make-ml.sh
+ install -m 755 -D debian/mlmmj-make-ml \
+ debian/mlmmj/usr/bin/mlmmj-make-ml
mv debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.sh.1 \
debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.1
dh_install -s
dh_installdirs -i
# mlmmj-php-web
- install -m 644 -D $(CURDIR)/contrib/web/php-user/mlmmj.php \
- $(CURDIR)/debian/mlmmj-php-web/var/www/mlmmj-php-web/mlmmj.php
- install -m 644 -D $(CURDIR)/contrib/web/php-user/README \
- $(CURDIR)/debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/README
- install -m 644 -D $(CURDIR)/contrib/web/php-user/example.html \
- $(CURDIR)/debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/examples/examples.html
+ install -m 644 -D contrib/web/php-user/mlmmj.php \
+ $(WEB_DIR)/mlmmj.php
+ install -m 644 -D contrib/web/php-user/README \
+ debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/README
+ install -m 644 -D contrib/web/php-user/example.html \
+ debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/examples/examples.html
+ install -m 644 -D debian/mlmmj-php-web.apache.conf \
+ debian/mlmmj-php-web/etc/mlmmj-php-web/apache.conf
+
# mlmmj-php-web-admin
- install -d $(CURDIR)/debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin
- install -m 644 $(CURDIR)/contrib/web/php-admin/htdocs/*.php \
- $(CURDIR)/debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin/
- install -m 644 $(CURDIR)/contrib/web/php-admin/htdocs/dot.htaccess \
- $(CURDIR)/debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin/.htaccess
- install -m 644 -D $(CURDIR)/contrib/web/php-admin/README \
- $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/doc/mlmmj-php-web-admin/README
- install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf
- install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates
- install -m 644 $(CURDIR)/contrib/web/php-admin/conf/* \
- $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf/
- install -m 644 $(CURDIR)/contrib/web/php-admin/templates/* \
- $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates/
- install -m 644 -D $(CURDIR)/debian/htpasswd \
- $(CURDIR)/debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/htpasswd
+ install -m 755 -d $(WEB_ADMIN_DIR)
+ install -m 644 contrib/web/php-admin/htdocs/*.php \
+ $(WEB_ADMIN_DIR)/
+ install -m 644 contrib/web/php-admin/htdocs/dot.htaccess \
+ $(WEB_ADMIN_DIR)/.htaccess
+ install -m 644 -D contrib/web/php-admin/README \
+ debian/mlmmj-php-web-admin/usr/share/doc/mlmmj-php-web-admin/README
+ install -d debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf
+ install -d debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates
+ install -m 644 contrib/web/php-admin/conf/* \
+ debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf/
+ install -m 644 contrib/web/php-admin/templates/* \
+ debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates/
+ install -m 644 -D debian/htpasswd \
+ debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/htpasswd
+ install -m 644 -D debian/mlmmj-php-web-admin.apache.conf \
+ debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/apache.conf
binary-common:
dh_testdir