From 4cfa43da5603bfc7bf823487486c1f543ea214c3 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Mon, 29 Dec 2008 20:21:29 +0000
Subject: [PATCH] STR #2007: removed hardcoded '../lib/' prefix in installation
 process

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6612 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 configure.in   | 10 ++++++++++
 fluid/Makefile |  4 ++--
 makeinclude.in |  5 +++++
 src/Makefile   | 18 +++++++++---------
 test/Makefile  | 12 ++++++------
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/configure.in b/configure.in
index 0b1000a9a..393e7a7ac 100644
--- a/configure.in
+++ b/configure.in
@@ -98,6 +98,11 @@ FLLIBNAME="../lib/libfltk_forms.a"
 GLLIBNAME="../lib/libfltk_gl.a"
 IMGLIBNAME="../lib/libfltk_images.a"
 
+LIBBASENAME="libfltk.a"
+FLLIBBASENAME="libfltk_forms.a"
+GLLIBBASENAME="libfltk_gl.a"
+IMGLIBBASENAME="libfltk_images.a"
+
 AC_SUBST(FLLIBNAME)
 AC_SUBST(GLDEMOS)
 AC_SUBST(GLLIBNAME)
@@ -109,6 +114,11 @@ AC_SUBST(LINKFLTKFORMS)
 AC_SUBST(LINKFLTKGL)
 AC_SUBST(LINKFLTKIMG)
 
+AC_SUBST(LIBBASENAME)
+AC_SUBST(FLLIBBASENAME)
+AC_SUBST(GLLIBBASENAME)
+AC_SUBST(IMGLIBBASENAME)
+
 dnl Handle compile-time options...
 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]])
 if test x$enable_debug = xyes; then
diff --git a/fluid/Makefile b/fluid/Makefile
index a26901caf..c94b2ff9c 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -54,8 +54,8 @@ include ../makeinclude
 
 all:	$(FLUID) fluid$(EXEEXT)
 
-fluid$(EXEEXT):		$(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
-			../lib/$(IMGLIBNAME)
+fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+			$(IMGLIBNAME)
 	echo Linking $@...
 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
 	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
diff --git a/makeinclude.in b/makeinclude.in
index 17a6d92c0..e90cacfca 100644
--- a/makeinclude.in
+++ b/makeinclude.in
@@ -72,6 +72,11 @@ GLDSONAME	= @GLDSONAME@
 IMGDSONAME	= @IMGDSONAME@
 DSOCOMMAND	= @DSOCOMMAND@
 
+LIBBASENAME	= @LIBBASENAME@
+FLLIBBASENAME	= @FLLIBBASENAME@
+GLLIBBASENAME	= @GLLIBBASENAME@
+IMGLIBBASENAME	= @IMGLIBBASENAME@
+
 # libraries to link with:
 AUDIOLIBS	= @AUDIOLIBS@
 DSOFLAGS	= -L. @DSOFLAGS@
diff --git a/src/Makefile b/src/Makefile
index 4a571b031..3f41bc27a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -493,17 +493,17 @@ install: $(LIBNAME) $(DSONAME) \
 	echo "Installing libraries in $(DESTDIR)$(libdir)..."
 	-$(INSTALL_DIR) $(DESTDIR)$(libdir)
 	-$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
+	$(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
 	$(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
 	$(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
 	$(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
-	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
-	$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
+	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME)
+	$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME)
 	if test x$(GLLIBNAME) != x; then \
 		$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
-		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
+		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
 	fi
-	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
+	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
 		$(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \
@@ -631,7 +631,7 @@ install: $(LIBNAME) $(DSONAME) \
 
 uninstall:
 	echo "Uninstalling libraries..."
-	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
+	$(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
 	fi
@@ -652,7 +652,7 @@ uninstall:
 		$(RM) $(DESTDIR)$(bindir)/$(DSONAME); \
 		$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
 	fi
-	$(RM) $(DESTDIR)$(libdir)/$(FLLIBNAME);
+	$(RM) $(DESTDIR)$(libdir)/$(FLLIBBASENAME);
 	if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
 	fi
@@ -674,7 +674,7 @@ uninstall:
 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
 	fi
 	if test x$(GLLIBNAME) != x; then\
-		$(RM) $(DESTDIR)$(libdir)/$(GLLIBNAME);\
+		$(RM) $(DESTDIR)$(libdir)/$(GLLIBBASENAME);\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
@@ -697,7 +697,7 @@ uninstall:
 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
 	fi
 	if test x$(IMGLIBNAME) != x; then\
-		$(RM) $(DESTDIR)$(libdir)/$(IMGLIBNAME);\
+		$(RM) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME);\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
diff --git a/test/Makefile b/test/Makefile
index 75841e024..baf6851ae 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -253,7 +253,7 @@ uninstall-osx:
 	../fluid/fluid$(EXEEXT) -c $<
 
 # All demos depend on the FLTK library...
-$(ALL): ../lib/$(LIBNAME)
+$(ALL): $(LIBNAME)
 
 # General demos...
 unittests$(EXEEXT): unittests.o
@@ -314,7 +314,7 @@ editor$(EXEEXT): editor.o
 fast_slow$(EXEEXT): fast_slow.o
 fast_slow.cxx:	fast_slow.fl ../fluid/fluid$(EXEEXT)
 
-file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME)
+file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
 	echo Linking $@...
 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
@@ -328,7 +328,7 @@ forms$(EXEEXT): forms.o
 
 hello$(EXEEXT): hello.o
 
-help$(EXEEXT): help.o ../lib/$(IMGLIBNAME)
+help$(EXEEXT): help.o $(IMGLIBNAME)
 	echo Linking $@...
 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
@@ -375,7 +375,7 @@ minimum$(EXEEXT): minimum.o
 
 navigation$(EXEEXT): navigation.o
 
-output$(EXEEXT): output.o ../lib/$(FLLIBNAME)
+output$(EXEEXT): output.o $(FLLIBNAME)
 	echo Linking $@...
 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
@@ -386,7 +386,7 @@ pack$(EXEEXT): pack.o
 
 pixmap$(EXEEXT): pixmap.o
 
-pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME)
+pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
 	echo Linking $@...
 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
@@ -435,7 +435,7 @@ valuators$(EXEEXT): valuators.o
 valuators.cxx:	valuators.fl ../fluid/fluid$(EXEEXT)
 
 # All OpenGL demos depend on the FLTK and FLTK_GL libraries...
-$(GLALL): ../lib/$(LIBNAME) ../lib/$(GLLIBNAME)
+$(GLALL): $(LIBNAME) $(GLLIBNAME)
 
 # OpenGL demos...
 CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o