apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Aaron Bannert <aa...@clove.org>
Subject [PATCH] some makefile cleanups
Date Thu, 11 Oct 2001 20:29:27 GMT
In preparation for some bigger APR makefile changes that I'll be making
soon, I noticed that some of the files we reference in the makefile
would be better off rooted in $(top_srcdir). Does this look like the
right thing to do here?

-aaron


Index: Makefile.in
===================================================================
RCS file: /home/cvspublic/apr/Makefile.in,v
retrieving revision 1.55
diff -u -r1.55 Makefile.in
--- Makefile.in	2001/09/14 14:10:05	1.55
+++ Makefile.in	2001/10/11 18:45:18
@@ -39,6 +39,7 @@
 libdir=@libdir@
 includedir=@includedir@
 srcdir=@srcdir@
+top_srcdir=@top_srcdir@
 
 delete-lib:
 	@if test -f $(TARGET_LIB); then \
@@ -52,11 +53,11 @@
 
 install: $(TARGET_LIB)
 	if [ ! -d $(includedir) ]; then \
-	    $(srcdir)/build/mkdir.sh $(includedir); \
+	    $(top_srcdir)/build/mkdir.sh $(includedir); \
 	fi; \
-	cp include/*.h $(includedir); \
+	cp $(top_srcdir)/include/*.h $(includedir); \
 	if [ ! -d $(libdir) ]; then \
-	    $(srcdir)/build/mkdir.sh $(libdir); \
+	    $(top_srcdir)/build/mkdir.sh $(libdir); \
 	fi; \
 	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
 	$(LIBTOOL) --mode=install cp APRVARS $(libdir)
@@ -81,10 +82,10 @@
 	fi
 
 $(TARGET_EXPORTS):
-	$(MKEXPORT) include/*.h > $@
+	$(MKEXPORT) $(top_srcdir)/include/*.h > $@
 
 dox:
-	doxygen docs/doxygen.conf
+	doxygen $(top_srcdir)/docs/doxygen.conf
 
 test: $(TARGET_LIB)
 	(cd test; make clean; make; \

Mime
View raw message