install library as program, not as data

[cln.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index f2041ee3279ee634aa664f8ba6cf2d327b26c701..4fade8f5cf4e58caf7fb70f87e6417f5bd89ce53 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -26,7 +26,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CXXCPP = @CXXCPP@
 INCLUDES = -I../include -I$(top_srcdir)/include
-CPPFLAGS += $(INCLUDES)
+override CPPFLAGS += $(INCLUDES)
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
@@ -39,6 +39,7 @@ RANLIB = @RANLIB@
 MV = mv
 LN = ln
 RM = rm -f
+MKDIR = mkdir -p
 @SET_MAKE@
 # Libtool's library interface versions:
 CL_CURRENT = @CL_CURRENT@
@@ -63,12 +64,14 @@ top_builddir = ..
 SUBDIR = .
 
 # Define the search path for sources.
-# The ":" below keeps config.status from removing this line.
-VPATH = $(srcdir)/$(SUBDIR) # :
+# The variable $(aux_srcdir) is needed because new versions of aufoconf tend to
+# remove $(srcdir), ${srcdir} and so on...
+aux_srcdir = @srcdir@
+VPATH = $(aux_srcdir)/$(SUBDIR)
 
 # Add subdirectory specific flags.
 include $(srcdir)/$(SUBDIR)/Makeflags
-CPPFLAGS += $(SUBDIR_INCLUDES)
+override CPPFLAGS += $(SUBDIR_INCLUDES)
 
 # Need to know the system name.
 SYSTEM := $(shell uname -s)
@@ -200,25 +203,15 @@ libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO)
        $(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) $(ALLOBJECTS_LO)
 
 install : all force
-       if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
-       $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcln.la $(DESTDIR)$(libdir)/libcln.la
-       if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi
-       if [ ! -d $(DESTDIR)$(includedir)/cln ] ; then mkdir $(DESTDIR)$(includedir)/cln ; fi
+       $(MKDIR) $(DESTDIR)$(libdir)
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) libcln.la $(DESTDIR)$(libdir)/libcln.la
+       $(MKDIR) $(DESTDIR)$(includedir)/cln
        $(INSTALL_DATA) $(top_srcdir)/include/cln/*.h $(DESTDIR)$(includedir)/cln
        $(INSTALL_DATA) ../include/cln/*.h $(DESTDIR)$(includedir)/cln
-#      if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
-#      if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
-#      if [ ! -d $(DESTDIR)$(datadir) ] ; then mkdir $(DESTDIR)$(datadir) ; fi
-#      if [ ! -d $(DESTDIR)$(datadir)/html ] ; then mkdir $(DESTDIR)$(datadir)/html ; fi
 
 installdirs : force
-       if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
-       if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi
-       if [ ! -d $(DESTDIR)$(includedir)/cln ] ; then mkdir $(DESTDIR)$(includedir)/cln ; fi
-#      if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
-#      if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
-#      if [ ! -d $(DESTDIR)$(datadir) ] ; then mkdir $(DESTDIR)$(datadir) ; fi
-#      if [ ! -d $(DESTDIR)$(datadir)/html ] ; then mkdir $(DESTDIR)$(datadir)/html ; fi
+       $(MKDIR) $(DESTDIR)$(libdir)
+       $(MKDIR) $(DESTDIR)$(includedir)/cln
 
 uninstall : force
        $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libcln.la