[java-libglom] Fix make distcheck



commit 7db2a3de32045ec3add53db077b369e3d924abdc
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Jan 23 10:44:21 2012 +0100

    Fix make distcheck
    
    * Makefile.am: Add src and build dirs to the paths to build the doc and
    source jars.

 ChangeLog   |    7 +++++++
 Makefile.am |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 17ce4e0..5b2e345 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-01-23  Murray Cumming  <murrayc murrayc com>
 
+	Fix make distcheck
+
+	* Makefile.am: Add src and build dirs to the paths to build the doc and 
+	source jars.
+
+2012-01-23  Murray Cumming  <murrayc murrayc com>
+
 	Adapt to the latest libglom API from git master.
 
 	* Makefile.am:
diff --git a/Makefile.am b/Makefile.am
index 71227b1..1a48fd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -193,8 +193,8 @@ docbuild: $(jarfile)
 	javadoc -public $(top_srcdir)/src/main/java/org/glom/libglom/*.java -d doc
 
 $(doc_jarfile): docbuild
-	$(JAR) cf $(JARFLAGS) $(top_builddir)/$(doc_jarfile) doc/*
+	$(JAR) cf $(JARFLAGS) $(top_builddir)/$(doc_jarfile) $(top_builddir)/doc/*
 
 $(sources_jarfile): $(generated_java_sources)
-	$(JAR) cf $(JARFLAGS) $(top_builddir)/$(sources_jarfile) src/main/java
+	$(JAR) cf $(JARFLAGS) $(top_builddir)/$(sources_jarfile) $(top_srcdir)/src/main/java
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]