From f5730b487f6c6ee1c61ab9852ef897ca54be211a Mon Sep 17 00:00:00 2001 From: Volker Braun Date: Fri, 28 Feb 2014 15:04:11 +0100 Subject: [PATCH 1/2] Do not hardcode the non-posix install program --- Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7a1f42a..101044e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11,6 +11,7 @@ system_libdir = @SYSTEM_LIBDIR@ pkgconfigdir = @PKGCONFIGDIR@ CC = @CC@ +INSTALL = @INSTALL@ PROG = pkgconf@EXEEXT@ SRCS = main.c cache.c pkg.c bsdstubs.c getopt_long.c fragment.c argvsplit.c fileio.c tuple.c dependency.c queue.c OBJS = ${SRCS:.c=.o} @@ -30,11 +31,11 @@ clean: install: mkdir -p $(DESTDIR)$(bindir) - install -c -m755 $(PROG) $(DESTDIR)$(bindir)/$(PROG) + @INSTALL_PROGRAM@ $(PROG) $(DESTDIR)$(bindir)/$(PROG) mkdir -p $(DESTDIR)$(datarootdir)/aclocal - install -c -m644 $(srcdir)/pkg.m4 $(DESTDIR)$(datarootdir)/aclocal/pkg.m4 + @INSTALL_DATA@ $(srcdir)/pkg.m4 $(DESTDIR)$(datarootdir)/aclocal/pkg.m4 mkdir -p $(DESTDIR)$(MANDIR) - install -c -m644 $(srcdir)/pkgconf.1 $(DESTDIR)$(MANDIR)/pkgconf.1 + @INSTALL_DATA@ $(srcdir)/pkgconf.1 $(DESTDIR)$(MANDIR)/pkgconf.1 check: $(PROG) $(SHELL) tests/run.sh ./$(PROG) From f445dfd32fe53e4e2821e3ad54c83251aba70ce1 Mon Sep 17 00:00:00 2001 From: Volker Braun Date: Fri, 28 Feb 2014 16:15:41 +0100 Subject: [PATCH 2/2] make install-sh executable --- install-sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 install-sh diff --git a/install-sh b/install-sh old mode 100644 new mode 100755