Fix #1571 and install libraries with 755 perms

[bacula/bacula] / bacula / src / findlib / Makefile.in

diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in
index bd6e23a9b1f1639ebecf24ba06d666ccee8aa768..d581f6f9aa7ec8b6ba11934253d0a5cd5b124473 100644 (file)
--- a/bacula/src/findlib/Makefile.in
+++ b/bacula/src/findlib/Makefile.in
@@ -22,17 +22,18 @@ dummy:
 #
 # include files installed when using libtool
 #
-INCLUDE_FILES = bfile.h find.h protos.h savecwd.h
+INCLUDE_FILES = bfile.h find.h protos.h 
 
 #
-LIBSRCS = find.c match.c find_one.c attribs.c create_file.c \
-         bfile.c drivetype.c enable_priv.c fstype.c mkpath.c \
-         savecwd.c
-LIBOBJS = $(LIBSRCS:.c=$(DEFAULT_OBJECT_TYPE))
+LIBBACFIND_SRCS = find.c match.c find_one.c attribs.c create_file.c \
+                 bfile.c drivetype.c enable_priv.c fstype.c mkpath.c \
+                 savecwd.c
+LIBBACFIND_OBJS = $(LIBBACFIND_SRCS:.c=.o)
+LIBBACFIND_LOBJS = $(LIBBACFIND_SRCS:.c=.lo)
 
-LIBBACFIND_LT_CURRENT = 1
-LIBBACFIND_LT_REVISION = 0
-LIBBACFIND_LT_AGE = 0
+LIBBACFIND_LT_CURRENT = @LIBBACFIND_LT_CURRENT@
+LIBBACFIND_LT_REVISION = @LIBBACFIND_LT_REVISION@
+LIBBACFIND_LT_AGE = @LIBBACFIND_LT_AGE@
 
 .SUFFIXES:     .c .o .lo
 .PHONY:
@@ -51,14 +52,14 @@ all: Makefile libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_T
        @echo "==== Make of findlib is good ===="
        @echo " "
 
-libbacfind.a: $(LIBOBJS) 
+libbacfind.a: $(LIBBACFIND_OBJS) 
        @echo "Making $@ ..."
-       $(AR) rc  $@ $(LIBOBJS)
+       $(AR) rc  $@ $(LIBBACFIND_OBJS)
        $(RANLIB) $@
 
-libbacfind.la: Makefile $(LIBOBJS) 
+libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
        @echo "Making $@ ..."
-       $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE)
+       $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
@@ -77,7 +78,7 @@ uninstall-includes:
 
 libtool-install: all
        $(MKDIR) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL_FINISH) $(INSTALL_PROGRAM) libbacfind$(DEFAULT_ARCHIVE_TYPE) $(DESTDIR)$(libdir)
+       $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbacfind$(DEFAULT_ARCHIVE_TYPE) $(DESTDIR)$(libdir)
 
 libtool-uninstall:
        $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacfind.la
@@ -87,15 +88,15 @@ install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@
 uninstall: @LIBTOOL_UNINSTALL_TARGET@ @INCLUDE_UNINSTALL_TARGET@
 
 libtool-clean:
-       find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
-       $(RMF) *.la
-       $(RMF) -r .libs _libs
+       @find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
+       @$(RMF) *.la
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
-       $(RMF) find core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
+clean: libtool-clean
+       @$(RMF) find core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
 
 realclean: clean
-       $(RMF) tags
+       @$(RMF) tags
 
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
@@ -114,7 +115,7 @@ depend:
        @$(MV) Makefile Makefile.bak
        @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
        @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-       @for src in $(LIBSRCS); do \
+       @for src in $(LIBBACFIND_SRCS); do \
            $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) $$src >> Makefile; \
        done
        @if test -f Makefile ; then \