From 4cbdd0d3dcbd0bdbc9d39f5dd461a9e70de3706b Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Wed, 6 May 2020 13:33:45 -0500 Subject: [PATCH] Support exec_prefix, bindir, includedir, libdir Autoconf configure scripts allow the user to specify alternate directories for exec_prefix, bindir, includedir, and libdir (see ./configure --help). Now, they are honored by the Makefile. --- src/Makefile.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 6588033..c610ec5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -10,9 +10,11 @@ AR = ar -rsc RM = /bin/rm LN = /bin/ln OBJECT_PATH = @object_path@ -LIBDIR = @libdir@ -PREFIX = @prefix@ -INCLUDEDIR = @includedir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ vpath %.o $(OBJECT_PATH) OBJECTS = Stk.o Generator.o Noise.o Blit.o BlitSaw.o BlitSquare.o Granulate.o \ @@ -93,13 +95,13 @@ $(SHAREDLIB) : $(OBJECTS) $(LN) -s @sharedname@ $(SHAREDLIB) install-headers: - install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk - cp -R ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk + install -d $(DESTDIR)$(includedir)/stk + cp -R ../include/*.h $(DESTDIR)$(includedir)/stk install: $(SHAREDLIB) install-headers - install -d $(DESTDIR)$(PREFIX)$(LIBDIR) - install -m 644 @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR) - ln -sf @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB) + install -d $(DESTDIR)$(libdir) + install -m 644 @sharedname@ $(DESTDIR)$(libdir) + ln -sf @sharedname@ $(DESTDIR)$(libdir)/$(SHAREDLIB) $(OBJECTS) : Stk.h