packages/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch (1712B) - raw
1 Source: Ćukasz Stelmach <stlman@poczta.fm> from http://bugs.gentoo.org/292856 2 Upstream: TODO 3 Reason: config belongs in /etc rather than /usr/share 4 5 diff -ur gmrun-0.9.2.orig/config/Makefile.am gmrun-0.9.2/config/Makefile.am 6 --- gmrun-0.9.2.orig/config/Makefile.am 2001-05-17 09:58:07.000000000 +0300 7 +++ gmrun-0.9.2/config/Makefile.am 2010-06-06 16:05:16.000000000 +0300 8 @@ -1,6 +1,6 @@ 9 # $Id: gmrun-0.9.2-sysconfdir.patch,v 1.1 2010/06/06 13:13:11 ssuominen Exp $ 10 11 -myrcdir = @PACKAGE_DATA_DIR@ 12 +myrcdir = $(sysconfdir) 13 myrc_DATA = gmrunrc 14 15 EXTRA_DIST = gmrunrc 16 diff -ur gmrun-0.9.2.orig/config.h.in gmrun-0.9.2/config.h.in 17 --- gmrun-0.9.2.orig/config.h.in 2003-11-16 12:47:07.000000000 +0200 18 +++ gmrun-0.9.2/config.h.in 2010-06-06 16:07:14.000000000 +0300 19 @@ -10,7 +10,6 @@ 20 #undef HAVE_STPCPY 21 #undef HAVE_LIBSM 22 #undef PACKAGE_LOCALE_DIR 23 -#undef PACKAGE_DATA_DIR 24 #undef PACKAGE_SOURCE_DIR 25 26 /* Define if you have the <dirent.h> header file. */ 27 diff -ur gmrun-0.9.2.orig/src/Makefile.am gmrun-0.9.2/src/Makefile.am 28 --- gmrun-0.9.2.orig/src/Makefile.am 2002-06-05 22:39:18.000000000 +0300 29 +++ gmrun-0.9.2/src/Makefile.am 2010-06-06 16:09:11.000000000 +0300 30 @@ -15,3 +15,5 @@ 31 32 gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@ 33 34 +AM_CPPFLAGS = \ 35 + -DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"' 36 diff -ur gmrun-0.9.2.orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc 37 --- gmrun-0.9.2.orig/src/prefs.cc 2002-08-16 13:48:22.000000000 +0300 38 +++ gmrun-0.9.2/src/prefs.cc 2010-06-06 16:07:14.000000000 +0300 39 @@ -30,7 +30,7 @@ 40 41 Prefs::Prefs() 42 { 43 - string file_name = PACKAGE_DATA_DIR"/"; 44 + string file_name = PACKAGE_SYSCONF_DIR"/"; 45 file_name += GMRUNRC; 46 init(file_name); 47