Don't use the -R (runtime link path) when not using libtool for the linking.

[bacula/bacula] / bacula / autoconf / Make.common.in

diff --git a/bacula/autoconf/Make.common.in b/bacula/autoconf/Make.common.in
index c4967df87c3000e2001fb11d34848ccf42e55a43..fdcd3a2c7be6c7947de13f694e3311708c2b4a9d 100644 (file)
--- a/bacula/autoconf/Make.common.in
+++ b/bacula/autoconf/Make.common.in
@@ -1,5 +1,8 @@
-# autoconf/Make.common.in        -*- Makefile -*-
-# release date (man), LSM date, version number/name, current maintainer
+#
+# This file is pulled in by all the Unix Bacula Makefiles
+#   so it has all the "common" definitions
+#
+
 DATE="@DATE@"
 LSMDATE=@LSMDATE@
 VERSION=@VERSION@
@@ -15,30 +18,32 @@ FTPSITEDIR=#
 
 SHELL = /bin/sh
 
-# This variable makes it possible to move the installation root to another
-# directory. This is useful when you're creating a binary distribution
-# If empty, normal root will be used.
-# You can run eg. 'make install DESTDIR=/packages/rxvt-xx' to accomplish
-# that.
-# DESTDIR = /usr/local/X11/$(VERNAME)
-
 # Installation target directories & other installation stuff
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 binprefix =
 manprefix =
+datarootdir = @datarootdir@
+docdir = @docdir@
 sbindir = @sbindir@
+libdir = @libdir@
+includedir = @includedir@
 sysconfdir = @sysconfdir@
-mandir = @mandir@/man1
-manext = 1
+plugindir = @plugindir@
+scriptdir = @scriptdir@
+archivedir = @archivedir@
+mandir = @mandir@
+manext = 8
+
+NO_ECHO = @
 
 # Tools & program stuff
 CC = @CC@
 CPP = @CPP@
 CXX = @CXX@
 MV = @MV@
-RM = @RM@
-RMF = @RM@ -f
+RM = @REMOVE@
+RMF = $(RM) -f
 CP = @CP@
 SED = @SED@
 AWK = @AWK@
@@ -46,22 +51,50 @@ ECHO = @ECHO@
 CMP = @CMP@
 TBL = @TBL@
 AR = @AR@
+GMAKE = @GMAKE@
 RANLIB = @RANLIB@
+MKDIR = @BUILD_DIR@/autoconf/mkinstalldirs
 INSTALL = @INSTALL@
 # add the -s to the following in PRODUCTION mode
-INSTALL_PROGRAM = @INSTALL@ -m 755
-INSTALL_DATA = @INSTALL@ -m 644
-INSTALL_SCRIPT = @INSTALL@ -m 755
+INSTALL_PROGRAM = $(INSTALL) -m @SBINPERM@
+INSTALL_LIB = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_SCRIPT = $(INSTALL) -m @SBINPERM@
+INSTALL_CONFIG = $(INSTALL) -m 640
+
+#
+# Libtool specific settings
+#
+DEFAULT_OBJECT_TYPE = @DEFAULT_OBJECT_TYPE@
+DEFAULT_ARCHIVE_TYPE = @DEFAULT_ARCHIVE_TYPE@
+DEFAULT_SHARED_OBJECT_TYPE = @DEFAULT_SHARED_OBJECT_TYPE@
+LIBTOOL = @BUILD_DIR@/libtool
+LIBTOOL_COMPILE = @LIBTOOL@ --silent --tag=CXX --mode=compile
+LIBTOOL_LINK = @LIBTOOL@ --silent --tag=CXX --mode=link
+LIBTOOL_INSTALL = @LIBTOOL@ --silent --tag=CXX --mode=install
+LIBTOOL_INSTALL_FINISH = @LIBTOOL@ --silent --tag=CXX --finish --mode=install
+LIBTOOL_UNINSTALL = @LIBTOOL@ --silent --tag=CXX --mode=uninstall
+LIBTOOL_CLEAN = @LIBTOOL@ --silent --tag=CXX --mode=clean
 
 # Flags & libs
-CFLAGS = @CFLAGS@ 
-CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@ @OPENSSL_INC@
+
+CPPFLAGS = @CPPFLAGS@ @OPENSSL_INC@
 LDFLAGS = @LDFLAGS@
-#DEFS = @DEFS@
+TTOOL_LDFLAGS = @TTOOL_LDFLAGS@
+#DEFS = @DEFS@ @LOCAL_DEFS@
 LIBS = @LIBS@
+WRAPLIBS = @WRAPLIBS@
 DINCLUDE = @DINCLUDE@
 DLIB = @DLIB@
-DB_LIBS = @DB_LIBS@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_INC = @PYTHON_INCDIR@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+
+
+# Windows (cygwin) flags 
+WCFLAGS = @WCFLAGS@
+WLDFLAGS = @WLDFLAGS@
 
 # X Include directory
 #XINC = @X_CFLAGS@ @XPM_CFLAGS@