Various cleanup works.

[pkg-mlmmj.git] / debian / rules

diff --git a/debian/rules b/debian/rules
old mode 100755 (executable)
new mode 100644 (file)
index 443c296..69e269c
--- a/debian/rules
+++ b/debian/rules
@@ -86,22 +86,23 @@ install-arch: build-arch
        rm -f $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml.sh
        install -m 755 -D $(CURDIR)/debian/mlmmj-make-ml.sh \
                $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml
+       rmdir $(CURDIR)/debian/mlmmj/usr/sbin
        dh_install -s
 
 install-indep: build-indep
         # 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
+               $(CURDIR)/debian/mlmmj-php-web/usr/share/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
        # mlmmj-php-web-admin
-       install -d $(CURDIR)/debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin
+       install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/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/
+               $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/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
+               $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/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