From 4b7d4cb0f7e4f7f56670e31ab747172adcd4eb5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Marchal?= Date: Fri, 24 Dec 2010 08:47:12 +0000 Subject: [PATCH] Convert some variables in Makefile to lowercase The Makefile variables BINDIR, SYSCONFDIR, MANDIR and MAN1DIR are now written in lowercase as it is the standard way to write such directory variables with automake. This change allows the not too uncommon path rewritting during installation such as "make install bindir=/tmp". --- Makefile.in | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile.in b/Makefile.in index 805cf44..b1350f3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,10 +7,10 @@ exec_prefix=@exec_prefix@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ docdir = @docdir@ CC = @CC@ -BINDIR = @bindir@ -MANDIR = @mandir@ -MAN1DIR = $(MANDIR)/man1 -SYSCONFDIR = @sysconfdir@ +bindir = @bindir@ +mandir = @mandir@ +man1dir = $(mandir)/man1 +sysconfdir = @sysconfdir@ SARGPHPDIR = @SARGPHPDIR@ FONTDIR = @FONTDIR@ IMAGEDIR = @IMAGEDIR@ @@ -74,34 +74,34 @@ sarg_manpage.html: sarg_manpage.xml xsltproc --stringparam use.id.as.filename 1 --stringparam root.filename sarg_manpage --nonet /usr/share/sgml/docbook/xsl-stylesheets/html/onechunk.xsl $< install: all install-po - -@if test ! -d $(DESTDIR)$(BINDIR); then \ - echo "creating $(DESTDIR)$(BINDIR)"; \ - mkdir -p $(DESTDIR)$(BINDIR); \ + -@if test ! -d $(DESTDIR)$(bindir); then \ + echo "creating $(DESTDIR)$(bindir)"; \ + mkdir -p $(DESTDIR)$(bindir); \ fi - -@if test ! -d $(DESTDIR)$(MAN1DIR); then \ - echo "creating $(DESTDIR)$(MAN1DIR)"; \ - mkdir -p $(DESTDIR)$(MAN1DIR); \ + -@if test ! -d $(DESTDIR)$(man1dir); then \ + echo "creating $(DESTDIR)$(man1dir)"; \ + mkdir -p $(DESTDIR)$(man1dir); \ fi - -@if test ! -d $(DESTDIR)$(SYSCONFDIR); then \ - echo "creating $(DESTDIR)$(SYSCONFDIR)"; \ - mkdir -p $(DESTDIR)$(SYSCONFDIR); \ + -@if test ! -d $(DESTDIR)$(sysconfdir); then \ + echo "creating $(DESTDIR)$(sysconfdir)"; \ + mkdir -p $(DESTDIR)$(sysconfdir); \ fi -@if test ! -d $(DESTDIR)$(IMAGEDIR); then \ echo "Creating $(DESTDIR)$(IMAGEDIR)"; \ mkdir -p $(DESTDIR)$(IMAGEDIR); \ fi - $(INSTALL_PROGRAM) sarg $(DESTDIR)$(BINDIR)/sarg - chmod 755 $(DESTDIR)$(BINDIR)/sarg - $(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(MAN1DIR)/sarg.1 - chmod 755 $(DESTDIR)$(MAN1DIR)/sarg.1 - @if test ! -f $(DESTDIR)$(SYSCONFDIR)/sarg.conf; then \ - echo "cp $(DESTDIR)$(SYSCONFDIR)/sarg.conf"; \ - cp sarg.conf $(DESTDIR)$(SYSCONFDIR)/sarg.conf; \ + $(INSTALL_PROGRAM) sarg $(DESTDIR)$(bindir)/sarg + chmod 755 $(DESTDIR)$(bindir)/sarg + $(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(man1dir)/sarg.1 + chmod 755 $(DESTDIR)$(man1dir)/sarg.1 + @if test ! -f $(DESTDIR)$(sysconfdir)/sarg.conf; then \ + echo "cp $(DESTDIR)$(sysconfdir)/sarg.conf"; \ + cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf; \ else \ - cp sarg.conf $(DESTDIR)$(SYSCONFDIR)/sarg.conf.default; \ + cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf.default; \ fi - cp ./exclude_codes $(DESTDIR)$(SYSCONFDIR); - cp ./user_limit_block $(DESTDIR)$(SYSCONFDIR); + cp ./exclude_codes $(DESTDIR)$(sysconfdir); + cp ./user_limit_block $(DESTDIR)$(sysconfdir); cp -r ./images/* $(DESTDIR)$(IMAGEDIR); -@if test -n "$(FONTDIR)" ; then \ if test ! -d "$(DESTDIR)$(FONTDIR)" ; then \ @@ -110,14 +110,14 @@ install: all install-po fi; \ cp -r ./fonts/* "$(DESTDIR)$(FONTDIR)"; \ fi - cp -r ./css.tpl $(DESTDIR)$(SYSCONFDIR); + cp -r ./css.tpl $(DESTDIR)$(sysconfdir); -@if test -n "$(SARGPHPDIR)" -a -d "$(DESTDIR)$(SARGPHPDIR)"; then \ cp -r ./sarg-php $(DESTDIR)$(SARGPHPDIR); \ fi uninstall: uninstall-po - rm -f $(DESTDIR)$(BINDIR)/sarg - rm -f $(DESTDIR)$(MAN1DIR)/sarg.1 + rm -f $(DESTDIR)$(bindir)/sarg + rm -f $(DESTDIR)$(man1dir)/sarg.1 TAGS: $(SRCS) etags $(SRCS) -- 2.47.2