Merge pull request #62 from vbraun/master

Do not hardcode "install"
feature/tap-sh
William Pitcock 2014-03-23 00:38:52 -05:00
commit 1f1feb0022
2 changed files with 4 additions and 3 deletions

View File

@ -11,6 +11,7 @@ system_libdir = @SYSTEM_LIBDIR@
pkgconfigdir = @PKGCONFIGDIR@ pkgconfigdir = @PKGCONFIGDIR@
CC = @CC@ CC = @CC@
INSTALL = @INSTALL@
PROG = pkgconf@EXEEXT@ 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 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} OBJS = ${SRCS:.c=.o}
@ -30,11 +31,11 @@ clean:
install: install:
mkdir -p $(DESTDIR)$(bindir) mkdir -p $(DESTDIR)$(bindir)
install -c -m755 $(PROG) $(DESTDIR)$(bindir)/$(PROG) @INSTALL_PROGRAM@ $(PROG) $(DESTDIR)$(bindir)/$(PROG)
mkdir -p $(DESTDIR)$(datarootdir)/aclocal 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) 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) check: $(PROG)
$(SHELL) tests/run.sh ./$(PROG) $(SHELL) tests/run.sh ./$(PROG)

0
install-sh Normal file → Executable file
View File