X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=ec2b7a98a5ec04173073157231935550cc5caf1a;hb=72880b69fb234a3b23edf2f3a73b1be852c22e10;hp=2ffce8a6d0c5c3c5e5ae96a9da882b1144b06114;hpb=4ab71635478b06bc83edf4aa53a4b5d3b370c48e;p=pkg-mlmmj.git

diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 2ffce8a..ec2b7a9
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,9 @@
 # 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
@@ -65,6 +68,7 @@ install-arch: build
 		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
+	rmdir $(CURDIR)/debian/mlmmj/usr/sbin
 	dh_install -s
 
 install-indep:
@@ -75,17 +79,20 @@ install-indep:
 
 	# mlmmj-php-web
 	install -m 644 -D contrib/web/php-user/mlmmj.php \
-		debian/mlmmj-php-web/var/www/mlmmj-php-web/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 debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin
+	install -m 755 -d $(WEB_ADMIN_DIR)
 	install -m 644 contrib/web/php-admin/htdocs/*.php \
-		debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin/
+		$(WEB_ADMIN_DIR)/
 	install -m 644 contrib/web/php-admin/htdocs/dot.htaccess \
-		debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin/.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
@@ -96,6 +103,8 @@ install-indep:
 		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