From 9e31153e9b6192bc201a9fed7f3ff070295f284f Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Sat, 2 Feb 2002 20:12:53 +0000 Subject: [PATCH] Install gtkrc.default from $(srcdir) for when $(builddir) is different. 2002-02-02 Peter Williams * gtk/Makefile.am (install-data-local): Install gtkrc.default from $(srcdir) for when $(builddir) is different. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/Makefile.am | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5c8cb176b7..99afa47910 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-02-02 Peter Williams + + * gtk/Makefile.am (install-data-local): Install gtkrc.default + from $(srcdir) for when $(builddir) is different. + Sat Feb 2 19:00:39 2002 Kristian Rietveld * gtk/Makefile.am: remove TESTGTK_RCFILE define diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5c8cb176b7..99afa47910 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2002-02-02 Peter Williams + + * gtk/Makefile.am (install-data-local): Install gtkrc.default + from $(srcdir) for when $(builddir) is different. + Sat Feb 2 19:00:39 2002 Kristian Rietveld * gtk/Makefile.am: remove TESTGTK_RCFILE define diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c8cb176b7..99afa47910 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-02-02 Peter Williams + + * gtk/Makefile.am (install-data-local): Install gtkrc.default + from $(srcdir) for when $(builddir) is different. + Sat Feb 2 19:00:39 2002 Kristian Rietveld * gtk/Makefile.am: remove TESTGTK_RCFILE define diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5c8cb176b7..99afa47910 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-02-02 Peter Williams + + * gtk/Makefile.am (install-data-local): Install gtkrc.default + from $(srcdir) for when $(builddir) is different. + Sat Feb 2 19:00:39 2002 Kristian Rietveld * gtk/Makefile.am: remove TESTGTK_RCFILE define diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5c8cb176b7..99afa47910 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-02-02 Peter Williams + + * gtk/Makefile.am (install-data-local): Install gtkrc.default + from $(srcdir) for when $(builddir) is different. + Sat Feb 2 19:00:39 2002 Kristian Rietveld * gtk/Makefile.am: remove TESTGTK_RCFILE define diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5c8cb176b7..99afa47910 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-02-02 Peter Williams + + * gtk/Makefile.am (install-data-local): Install gtkrc.default + from $(srcdir) for when $(builddir) is different. + Sat Feb 2 19:00:39 2002 Kristian Rietveld * gtk/Makefile.am: remove TESTGTK_RCFILE define diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5c8cb176b7..99afa47910 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-02-02 Peter Williams + + * gtk/Makefile.am (install-data-local): Install gtkrc.default + from $(srcdir) for when $(builddir) is different. + Sat Feb 2 19:00:39 2002 Kristian Rietveld * gtk/Makefile.am: remove TESTGTK_RCFILE define diff --git a/gtk/Makefile.am b/gtk/Makefile.am index c51329eb49..50e0a421fe 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -583,7 +583,7 @@ EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la # Install a RC file for the default GTK+ theme install-data-local: install-ms-lib install-libtool-import-lib $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0 - $(INSTALL) gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc + $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc