diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-12-29 19:45:46 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-12-29 19:45:46 +0000 |
| commit | 6b3f61e3ffab1e3770a819aceecb06decf13f9da (patch) | |
| tree | 36720c0b169a6049bbc3ed80aefa85affa3074b1 /src/Makefile | |
| parent | 7180c24f3c32491971f984196607ff65a345a914 (diff) | |
In the configuration setp, LIBNAME (which contains the local path of the library as seen from the src directory) was used wrong. I added LIBBASENAME, the true library name without the path, and replaced LIBNAME wherever it was used wrongly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6611 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile index f7e5531a0..a82a532ce 100644 --- a/src/Makefile +++ b/src/Makefile @@ -504,17 +504,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.3; then\ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \ @@ -643,7 +643,7 @@ install: $(LIBNAME) $(DSONAME) \ uninstall: echo "Uninstalling libraries..." - $(RM) $(DESTDIR)$(libdir)/$(LIBNAME) + $(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME) if test x$(DSONAME) = xlibfltk.so.1.3; then\ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ fi @@ -664,7 +664,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.3; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ fi @@ -686,7 +686,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.3; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ @@ -709,7 +709,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.3; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ |