* [gentoo-commits] gentoo-x86 commit in x11-misc/gmrun/files: gmrun-0.9.2-sysconfdir.patch
@ 2010-06-06 13:13 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2010-06-06 13:13 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/06/06 13:13:11
Added: gmrun-0.9.2-sysconfdir.patch
Log:
Use sysconfdir for gmrunrc wrt #292856 by Łukasz Stelmach.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch?rev=1.1&content-type=text/plain
Index: gmrun-0.9.2-sysconfdir.patch
===================================================================
http://bugs.gentoo.org/292856
diff -ur gmrun-0.9.2.orig/config/Makefile.am gmrun-0.9.2/config/Makefile.am
--- gmrun-0.9.2.orig/config/Makefile.am 2001-05-17 09:58:07.000000000 +0300
+++ gmrun-0.9.2/config/Makefile.am 2010-06-06 16:05:16.000000000 +0300
@@ -1,6 +1,6 @@
# $Id: gmrun-0.9.2-sysconfdir.patch,v 1.1 2010/06/06 13:13:11 ssuominen Exp $
-myrcdir = @PACKAGE_DATA_DIR@
+myrcdir = $(sysconfdir)
myrc_DATA = gmrunrc
EXTRA_DIST = gmrunrc
diff -ur gmrun-0.9.2.orig/config.h.in gmrun-0.9.2/config.h.in
--- gmrun-0.9.2.orig/config.h.in 2003-11-16 12:47:07.000000000 +0200
+++ gmrun-0.9.2/config.h.in 2010-06-06 16:07:14.000000000 +0300
@@ -10,7 +10,6 @@
#undef HAVE_STPCPY
#undef HAVE_LIBSM
#undef PACKAGE_LOCALE_DIR
-#undef PACKAGE_DATA_DIR
#undef PACKAGE_SOURCE_DIR
/* Define if you have the <dirent.h> header file. */
diff -ur gmrun-0.9.2.orig/src/Makefile.am gmrun-0.9.2/src/Makefile.am
--- gmrun-0.9.2.orig/src/Makefile.am 2002-06-05 22:39:18.000000000 +0300
+++ gmrun-0.9.2/src/Makefile.am 2010-06-06 16:09:11.000000000 +0300
@@ -15,3 +15,5 @@
gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
+AM_CPPFLAGS = \
+ -DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
diff -ur gmrun-0.9.2.orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc
--- gmrun-0.9.2.orig/src/prefs.cc 2002-08-16 13:48:22.000000000 +0300
+++ gmrun-0.9.2/src/prefs.cc 2010-06-06 16:07:14.000000000 +0300
@@ -30,7 +30,7 @@
Prefs::Prefs()
{
- string file_name = PACKAGE_DATA_DIR"/";
+ string file_name = PACKAGE_SYSCONF_DIR"/";
file_name += GMRUNRC;
init(file_name);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-06-06 13:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-06 13:13 [gentoo-commits] gentoo-x86 commit in x11-misc/gmrun/files: gmrun-0.9.2-sysconfdir.patch Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox