diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-04-12 05:51:58 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2004-04-12 05:51:58 +0000 |
| commit | cde22f21c7ebf1da568b0bab24f73268542595ab (patch) | |
| tree | ff915358acee51b585b1fcbcd797eec14d85a501 /lib | |
| parent | 80d6974ee3365eae75534669f681cf92caf3e836 (diff) | |
| download | classpath-cde22f21c7ebf1da568b0bab24f73268542595ab.tar.gz | |
2004-04-12 Michael Koch <konqueror@gmx.de>
* configure.ac: Call only CLASSPATH_WITH_GLIBJ to get what to install.
* acinclude.m4
(CLASSPATH_WITH_GLIBJ): New function to specify what to install.
(CLASSPATH_ENABLE_GLIBJ): Removed.
(CLASSPATH_ENABLE_CLASS_INSTALL): Removed.
* lib/Makefile.am: Handle INSTALL_GLIBJ_ZIP and INSTALL_CLASS_FILES.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 3ebc23b01..09dc2af1b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -62,13 +62,13 @@ ARG_CLASSPATH_JAVAH = -classpath JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB) -if CREATE_GLIBJ +if INSTALL_GLIBJ_ZIP dist_pkgdata_DATA = glibj.zip -endif # CREATE_GLIBJ +endif # INSTALL_GLIBJ_ZIP -if INSTALL_CLASSFILES +if INSTALL_CLASS_FILES noinst_DATA = genclasses compile-classes resources @@ -86,7 +86,7 @@ uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir)/javax rm -rf $(DESTDIR)$(pkgdatadir)/org -endif # INSTALL_CLASSFILES +endif # INSTALL_CLASS_FILES .PHONY: genclasses |