diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2012-07-14 20:34:37 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2012-07-14 20:34:37 +0000 |
| commit | eb153d80abcecf6158b85276bca2fe3f1954eca5 (patch) | |
| tree | 7345a6a4748fd386567caba073468d32230a2352 /www-client/httrack | |
| parent | Remove another older version (diff) | |
| download | gentoo-2-eb153d80abcecf6158b85276bca2fe3f1954eca5.tar.gz gentoo-2-eb153d80abcecf6158b85276bca2fe3f1954eca5.tar.bz2 gentoo-2-eb153d80abcecf6158b85276bca2fe3f1954eca5.zip | |
www-client/httrack: Fix regression on /usr/share/httrack/html (bug #425692)
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'www-client/httrack')
| -rw-r--r-- | www-client/httrack/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/httrack/files/httrack-3.45.4-htmldir.patch | 17 |
2 files changed, 12 insertions, 11 deletions
diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog index 9d2245ea1e93..90956667b749 100644 --- a/www-client/httrack/ChangeLog +++ b/www-client/httrack/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/httrack # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.40 2012/07/10 19:58:41 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.41 2012/07/14 20:34:37 sping Exp $ + + 14 Jul 2012; Sebastian Pipping <sping@gentoo.org> + files/httrack-3.45.4-htmldir.patch: + Fix regression on /usr/share/httrack/html reported by ago (bug #425692) 10 Jul 2012; Johannes Huber <johu@gentoo.org> httrack-3.45.4.ebuild: Stable for x86, wrt bug #425692 diff --git a/www-client/httrack/files/httrack-3.45.4-htmldir.patch b/www-client/httrack/files/httrack-3.45.4-htmldir.patch index fa9808f60955..d13fe14ddc61 100644 --- a/www-client/httrack/files/httrack-3.45.4-htmldir.patch +++ b/www-client/httrack/files/httrack-3.45.4-htmldir.patch @@ -23,16 +23,13 @@ WebPixmapdir = $(datadir)/pixmaps WebGPixmapdir = $(datadir)/httrack/icons VFolderEntrydir = $(prefix)/share/applications -@@ -32,12 +32,3 @@ - $(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) \ - $(WebPixmap_DATA) $(WebGPixmap_DATA) $(VFolderEntry_DATA) \ - httrack.css -- --install-data-hook: -- if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \ -- ( cd $(DESTDIR)$(prefix)/share/httrack \ +@@ -36,8 +36,6 @@ + install-data-hook: + if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \ + ( cd $(DESTDIR)$(prefix)/share/httrack \ - && mv -f ../doc/httrack/html html \ - && cd ../doc/httrack/ \ - && $(LN_S) ../../httrack/html html \ -- ) \ -- fi ++ && $(LN_S) $(htmldir) html \ + ) \ + fi |