Put %p early in the include and link paths. diff --git a/Makefile.in b/Makefile.in --- a/Makefile.in +++ b/Makefile.in @@ -45,22 +45,21 @@ MYBINDIR = @bindir@ MYBINDIR = @bindir@ MYMAN1DIR = @mandir@/man1 MYMAN3DIR = @mandir@/man3 -MYDATADIR = @datadir@/$(PACKAGE) +MYDATADIR = @datadir@ MYPCDIR = @libdir@/pkgconfig DESTDIR = # Building binaries CC = @CC@ -CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \ - -I$(HOME)/include -I/usr/local/include @MYDEFS@ \ +CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I%p/include -I$(MYHEADDIR) @MYDEFS@ \ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@ LD = @LD@ LIBS = -lqdbm @LIBS@ -LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ -LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS) +LIBLDFLAGS = @LDFLAGS@ -L. -L%p/lib @LIBS@ +LDFLAGS = @LDFLAGS@ -L. -L%p/lib $(LIBS) LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib AR = @AR@ ARFLAGS = rcsv