mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
0dbe60dd3d
version number to libdata/pkgconfig/libgcj.pc. Fix packaging on amd64 on the way (enabling Java actually was a noop, except for pkg-plist). Update lang/gcc41 to the 20061013 snapshot of GCC 4.1.2. These changes allow us to remove the CONFLICT between lang/gcc41 and lang/gcc42 when building with Java support (the default on i386). Approved by: portmgr (erwin)
14 lines
522 B
Plaintext
14 lines
522 B
Plaintext
Index: libjava/Makefile.in
|
|
===================================================================
|
|
--- libjava/Makefile.in (revision 117734)
|
|
+++ libjava/Makefile.in (working copy)
|
|
@@ -712,7 +712,7 @@
|
|
$(am__append_2) $(am__append_3)
|
|
toolexecmainlib_DATA = libgcj.spec
|
|
dbexec_LTLIBRARIES = libjvm.la
|
|
-pkgconfigdir = $(libdir)/pkgconfig
|
|
+pkgconfigdir = $(prefix)/libdata/pkgconfig
|
|
jardir = $(datadir)/java
|
|
jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
|
|
@JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
|