From 4ab71635478b06bc83edf4aa53a4b5d3b370c48e Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 5 Mar 2009 12:03:51 +0100 Subject: [PATCH] rules: Removed unnecessary occurrences of $(CURDIR). --- debian/changelog | 5 +++-- debian/rules | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6511fca..b2ec758 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,8 @@ mlmmj (1.2.16-0.1) unstable; urgency=low * debian/rules: - Cleanup: There is no need to have build-arch and build-indep - especially if the latter is empty. Removed configure from .PHONY to - prevent configure being called twice. + prevent configure being called twice. Removed unnecessary occurrences of + $(CURDIR). - Actually pass CFLAGS to configure. - Rename mlmmj-make-ml.sh.1 to mlmmj-make-ml.1, since we rename the binary as well. @@ -42,7 +43,7 @@ mlmmj (1.2.16-0.1) unstable; urgency=low * debian/docs: - Removed. This file is not needed. - -- Sebastian Harl Thu, 05 Mar 2009 10:35:53 +0100 + -- Sebastian Harl Thu, 05 Mar 2009 12:02:58 +0100 mlmmj (1.2.15-1.1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index fee51dd..2ffce8a 100755 --- a/debian/rules +++ b/debian/rules @@ -60,9 +60,9 @@ install-arch: build # 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 @@ -74,28 +74,28 @@ install-indep: 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 \ + debian/mlmmj-php-web/var/www/mlmmj-php-web/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 # 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 -d debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin + install -m 644 contrib/web/php-admin/htdocs/*.php \ + debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin/ + install -m 644 contrib/web/php-admin/htdocs/dot.htaccess \ + debian/mlmmj-php-web-admin/var/www/mlmmj-php-web-admin/.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 binary-common: dh_testdir -- 2.30.2