Archives
Archives
| From: | "Jeroen Roovers (jer)" <jer@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in dev-util/global/files: global-5.9.2-localstatedir.patch |
| Date: | Thu, 02 Sep 2010 17:12:29 |
| Message-Id: | 20100902171225.A8E1B20054@flycatcher.gentoo.org |
| 1 | jer 10/09/02 17:12:25 |
| 2 | |
| 3 | Modified: global-5.9.2-localstatedir.patch |
| 4 | Log: |
| 5 | Fix bad patch after upstream review. |
| 6 | |
| 7 | (Portage version: 2.2_rc72/cvs/Linux i686) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.2 dev-util/global/files/global-5.9.2-localstatedir.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/global/files/global-5.9.2-localstatedir.patch?rev=1.2&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/global/files/global-5.9.2-localstatedir.patch?rev=1.2&content-type=text/plain |
| 14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/global/files/global-5.9.2-localstatedir.patch?r1=1.1&r2=1.2 |
| 15 | |
| 16 | Index: global-5.9.2-localstatedir.patch |
| 17 | =================================================================== |
| 18 | RCS file: /var/cvsroot/gentoo-x86/dev-util/global/files/global-5.9.2-localstatedir.patch,v |
| 19 | retrieving revision 1.1 |
| 20 | retrieving revision 1.2 |
| 21 | diff -u -r1.1 -r1.2 |
| 22 | --- global-5.9.2-localstatedir.patch 1 Sep 2010 13:40:39 -0000 1.1 |
| 23 | +++ global-5.9.2-localstatedir.patch 2 Sep 2010 17:12:25 -0000 1.2 |
| 24 | @@ -1,18 +1,11 @@ |
| 25 | ---- a/htags/Makefile.am 2010-08-30 14:19:04.000000000 +0200 |
| 26 | -+++ b/htags/Makefile.am 2010-09-01 15:19:14.000000000 +0200 |
| 27 | -@@ -27,14 +27,8 @@ |
| 28 | - |
| 29 | - man_MANS = htags.1 |
| 30 | - |
| 31 | --gtagsdir = ${datadir}/gtags |
| 32 | -+gtagsdir = ${localstatedir}/gtags |
| 33 | - gtags_DATA = global.cgi.tmpl ghtml.cgi.tmpl completion.cgi.tmpl bless.sh.tmpl \ |
| 34 | - jscode_suggest.tmpl jscode_treeview.tmpl style.css.tmpl |
| 35 | +--- htags/Makefile.am.orig 2010-08-30 14:19:04.000000000 +0200 |
| 36 | ++++ htags/Makefile.am 2010-09-02 19:00:48.000000000 +0200 |
| 37 | +@@ -33,7 +33,7 @@ |
| 38 | EXTRA_DIST = $(man_MANS) $(gtags_DATA) manual.in global.cgi.tmpl.in completion.cgi.tmpl.in \ |
| 39 | const.h c.l cpp.l java.l php.l asm.l |
| 40 | --install-data-hook: |
| 41 | + install-data-hook: |
| 42 | - dir="$(localstatedir)/gtags/sitekeys"; \ |
| 43 | -- if [ ! -d $$dir ]; then \ |
| 44 | -- $(MKDIR_P) $$dir; \ |
| 45 | -- chmod 755 $$dir; \ |
| 46 | -- fi |
| 47 | ++ dir="$(DESTDIR)$(localstatedir)/gtags/sitekeys"; \ |
| 48 | + if [ ! -d $$dir ]; then \ |
| 49 | + $(MKDIR_P) $$dir; \ |
| 50 | + chmod 755 $$dir; \ |