* Makefile.in: Rebuilt.

	* Makefile.am (install-data-local): Use mkinstalldirs.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117634 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8f3e35a..28a7e35 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-11  Tom Tromey  <tromey@redhat.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (install-data-local): Use mkinstalldirs.
+

 2006-10-10  Tom Tromey  <tromey@redhat.com>
 
        * gnu/classpath/natSystemProperties.cc (insertSystemProperties):
 2006-10-10  Tom Tromey  <tromey@redhat.com>
 
        * gnu/classpath/natSystemProperties.cc (insertSystemProperties):

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index f7ceccd..83b84e4 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -549,6 +549,7 @@ install-data-local:
 ## Install the .pc file.
        @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
        file="libgcj-$${pc_version}.pc"; \
 ## Install the .pc file.
        @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
        file="libgcj-$${pc_version}.pc"; \

+       $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \

        echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
        $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file
 ## We use a GNU make trick here so that we don't go over the command
        echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
        $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file
 ## We use a GNU make trick here so that we don't go over the command

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index b93916c..e391d1b 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -11762,6 +11762,7 @@ install-data-local:
        $(PRE_INSTALL)
        @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
        file="libgcj-$${pc_version}.pc"; \
        $(PRE_INSTALL)
        @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
        file="libgcj-$${pc_version}.pc"; \

+       $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \

        echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
        $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file
        @echo Creating list of headers to install...
        echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
        $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file
        @echo Creating list of headers to install...