summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2003-08-18 19:26:43 +0000
committerMark Wielaard <mark@klomp.org>2003-08-18 19:26:43 +0000
commitea41648927dd2eeae61b2bb6836ce7b1a58de257 (patch)
tree3aaf54d9aa3f132c27bf6d2d587dad42fe8c6a99
parentce87c42e058d73f7cc96ace4333f235209839d27 (diff)
downloadclasspath-ea41648927dd2eeae61b2bb6836ce7b1a58de257.tar.gz
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Disable --enable-gjdoc.
* doc/api/Makefile.am (dist-hook): Removed.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
-rw-r--r--doc/api/Makefile.am13
3 files changed, 6 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index d83b2f342..31f518c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-08-18 Mark Wielaard <mark@klomp.org>
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Disable --enable-gjdoc.
+ * doc/api/Makefile.am (dist-hook): Removed.
+
+2003-08-18 Mark Wielaard <mark@klomp.org>
+
* Makefile.am (dist-hook): Remove entries now handled by Makefile.am
in the external directory.
diff --git a/Makefile.am b/Makefile.am
index 7103dfb41..1e18bde15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ native: lib
EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE
-DISTCHECK_CONFIGURE_FLAGS = --enable-gjdoc
+#DISTCHECK_CONFIGURE_FLAGS = --enable-gjdoc
dist-hook:
-$(mkinstalldirs) $(distdir)/include
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index bbd9d5829..4a078b469 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -4,19 +4,6 @@ endif
EXTRA_DIST = classpath-copyright.xml
-dist-hook:
- -$(mkinstalldirs) $(distdir)
- @if [ -d $(srcdir)/xslt ]; then \
- echo $(CP) -R $(srcdir)/xslt $(distdir); \
- $(CP) -R $(srcdir)/xslt $(distdir); \
- fi
- @if [ -d html ]; then \
- echo $(CP) -R html $(distdir); \
- $(CP) -R html $(distdir); \
- else \
- echo "Error: did not configure --enable-gjdoc"; exit 1; \
- fi
-
htmllist := $(shell $(FIND) html | grep -v "^html$$")
install-data-local: