diff -ur sane-1.0.1/ChangeLog sane-1.0.1-pere/ChangeLog --- sane-1.0.1/ChangeLog Mon Apr 19 18:21:33 1999 +++ sane-1.0.1-pere/ChangeLog Wed Apr 28 01:26:32 1999 @@ -1,3 +1,9 @@ +1999-04-28 Petter Reinholdtsen + + * backend/Makefile.in (install): Correct target to work on + platforms where dll endings isn't .so. Extract endings from + libsane-dll.la. + 1999-04-19 David Mosberger-Tang * Version 1.0.1 released. diff -ur sane-1.0.1/backend/Makefile.in sane-1.0.1-pere/backend/Makefile.in --- sane-1.0.1/backend/Makefile.in Sun Apr 4 01:00:44 1999 +++ sane-1.0.1-pere/backend/Makefile.in Wed Apr 28 01:23:20 1999 @@ -94,21 +94,26 @@ || exit 1; \ done @$(LIBTOOL) $(MINST) --finish $(libsanedir) - @list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \ - file=libsane-$${be}.so.$(V_MAJOR); \ + @# Assume the dll name without any versions is last + @dllend=`grep library_names= libsane-dll.la |rev|cut -d" " -f1|rev|sed 's/libsane-dll.//'|cut -d\' -f1`; \ + list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \ + file=libsane-$${be}.$$dllend.$(V_MAJOR); \ lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \ if test ! -f $${file} -a -n "$${lib}"; then \ $(LN_S) $${lib} $${file}; \ fi; \ done - rm -f $(libdir)/libsane.a $(libdir)/libsane.so \ - $(libdir)/libsane.so.$(V_MAJOR)* - $(LN_S) sane/libsane-dll.a $(libdir)/libsane.a - $(LN_S) sane/libsane-dll.so $(libdir)/libsane.so - @cd $(libsanedir) && for n in libsane-dll.so.$(V_MAJOR)*; do \ + @# Assume the dll name without any versions is last + @dllend=`grep library_names= libsane-dll.la |rev|cut -f1 -d" "|rev|sed 's/libsane-dll.//'|cut -f1 -d\'`; \ + rm -f $(libdir)/libsane.a $(libdir)/libsane.$$dllend \ + $(libdir)/libsane.$$dllend.$(V_MAJOR)*; \ + $(LN_S) sane/libsane-dll.a $(libdir)/libsane.a; \ + $(LN_S) sane/libsane-dll.$$dllend $(libdir)/libsane.$$dllend ; \ + cd $(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR)*; do \ nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \ (cd ..; $(LN_S) sane/$$n $$nn); \ done || exit 1 + $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la @list="$(CONFIGS)"; for cfg in $$list; do \ if test ! -r $(srcdir)/$${cfg}; then continue; fi; \ if test -f $(configdir)/$${cfg}; then \