summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Duft <mduft@gentoo.org>2009-01-26 14:08:48 +0000
committerMarkus Duft <mduft@gentoo.org>2009-01-26 14:08:48 +0000
commitc157c46dc9747258100175ece34cde7043a57b14 (patch)
tree1afe8f359faa14253292a3da7fc056212754a8f3 /dev-util/confix/files
parentDocs generation is totally broken with mono-2.0+, so just don't build them. S... (diff)
downloadhistorical-c157c46dc9747258100175ece34cde7043a57b14.tar.gz
historical-c157c46dc9747258100175ece34cde7043a57b14.tar.bz2
historical-c157c46dc9747258100175ece34cde7043a57b14.zip
corrected minor issue with fast-install patch.
Package-Manager: portage-2.1.4.5
Diffstat (limited to 'dev-util/confix/files')
-rw-r--r--dev-util/confix/files/2.1.0/fast-install.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/dev-util/confix/files/2.1.0/fast-install.patch b/dev-util/confix/files/2.1.0/fast-install.patch
index f64582579bab..0c3778ae7f73 100644
--- a/dev-util/confix/files/2.1.0/fast-install.patch
+++ b/dev-util/confix/files/2.1.0/fast-install.patch
@@ -1,6 +1,6 @@
diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.0/libconfix/core/automake/file_installer.py
--- Confix-2.1.0.orig/libconfix/core/automake/file_installer.py 2008-10-21 11:17:30 +0200
-+++ Confix-2.1.0/libconfix/core/automake/file_installer.py 2008-12-17 11:58:32 +0100
++++ Confix-2.1.0/libconfix/core/automake/file_installer.py 2009-01-26 15:02:50 +0100
@@ -22,6 +22,11 @@
from libconfix.core.utils.paragraph import Paragraph
from libconfix.core.utils import const
@@ -159,7 +159,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
def automake_install_prefixfiles_(self, makefile_am):
for dirname, filelist in self.dir2filedict_(file2dirdict=self.prefixfiles_).iteritems():
# define directory
-@@ -291,17 +401,93 @@
+@@ -291,17 +401,92 @@
pass
pass
@@ -232,12 +232,11 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
+ 'done; \\',
+ 'test -z "$${__f}" && exit 0; \\',
+ 'cp -fp $${__f} ' + targetdir + ' || exit 1; \\',
-+ 'chmod ' + mode + ' $${__tf} || exit 1; \\',
-+ 'touch ' + rulename + ';']))
++ 'chmod ' + mode + ' $${__tf} || exit 1;']))
+ makefile_am.add_element(
+ Rule(targets=[rulename + '_clean'],
+ prerequisites=[],
-+ commands=['rm -f ' + rulename + ' ' + str(' ' + targetdir + '/').join([''] + files) + ';']))
++ commands=['rm -f ' + str(' ' + targetdir + '/').join([''] + files) + ';']))
+ pass
+
+ def fast_install_private_headers_(self, makefile_am):
@@ -258,7 +257,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
makefile_am.add_element(install_local_rule)
makefile_am.add_element(clean_local_rule)
-@@ -321,20 +507,37 @@
+@@ -321,20 +506,37 @@
commands=['-$(mkinstalldirs) '+targetdir]))
# copy files