Ticket #16465: patch-Makefile.in.diff

Makefile.in

@@ -42 +42 @@
 TARGETDIR=@TARGETDIR@
 
 include make/ptlib.mak
+include make/common.mak
+
+LIB_FILENAME=$(PTLIB_FILE)
+include make/lib.mak
 
 SUBDIRS := src/ptlib/$(TARGETDIR)
 ifeq (1, $(HAS_PLUGINS))
@@ -70 +74 @@
 docs: 
         doxygen ptlib_cfg.dxy
 
+
+install-shared:
+
 install:
         ( for dir in $(DESTDIR)$(LIBDIR) \
                      $(DESTDIR)$(PREFIX)/bin \
@@ -79 +86 @@
                      $(DESTDIR)$(PREFIX)/share/ptlib/make ; \
                 do mkdir -p $$dir ; chmod 755 $$dir ; \
         done )
-        $(INSTALL) -m 444 lib/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
+        $(INSTALL) -m 444 lib/$(LIBNAME_PAT) $(DESTDIR)$(LIBDIR)
         (cd $(DESTDIR)$(LIBDIR) ; \
-                rm -f  $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ ; \
-                ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ \
+                rm -f  $(LIBNAME_MIN) ; \
+                ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN) \
         )
         (cd $(DESTDIR)$(LIBDIR) ; \
-                rm -f  $(PTLIB_FILE).@MAJOR_VERSION@ ; \
-                ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE).@MAJOR_VERSION@ \
+                rm -f  $(LIBNAME_MAJ) ; \
+                ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ) \
         )
         (cd $(DESTDIR)$(LIBDIR) ; \
                 rm -f  $(PTLIB_FILE) ; \
-                ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \
+                ln -sf $(LIBNAME_PAT) $(PTLIB_FILE) \
         )
         (cd $(DESTDIR)$(LIBDIR); \
                 rm -f  libpt.@SHAREDLIBEXT@ ; \
                 ln -sf $(PTLIB_FILE) libpt.@SHAREDLIBEXT@ \
         )
 ifeq (1, $(HAS_PLUGINS))
-        cd plugins/ptlib/device/ ; \
+        cd plugins/ptlib/device/ && \
         ( for dir in ./* ;\
                 do mkdir -p $(DESTDIR)$(LIBDIR)/ptlib/devices/$$dir ; \
                 chmod 755 $(DESTDIR)$(LIBDIR)/ptlib/devices/$$dir ; \
-                (for fn in ./$$dir/*.so ; \
+                (for fn in ./$$dir/*.@SHAREDLIBEXT@ ; \
                         do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/ptlib/devices/$$dir; \
                 done ); \
         done )