Mercurial > gub
changeset 3760:dce0e724705b
Remove double slashes before packaging_suffix_dir.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 07 Sep 2007 15:56:51 +0200 |
| parents | db45f1eaeae3 |
| children | f80db00e4021 |
| files | gub/gubb.py gub/gup.py gub/settings.py gub/specs/glib.py gub/specs/guile.py |
| diffstat | 5 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/gubb.py Fri Sep 07 15:27:54 2007 +0200 +++ b/gub/gubb.py Fri Sep 07 15:56:51 2007 +0200 @@ -45,7 +45,7 @@ self._os_interface.system ('rm -rf %s%s ' % (base, f)) def create_tarball (self): - cmd = 'tar -C %(install_root)s/%(packaging_suffix_dir)s --ignore-failed --exclude="*~" -zcf %(split_ball)s ' + cmd = 'tar -C %(install_root)s%(packaging_suffix_dir)s --ignore-failed --exclude="*~" -zcf %(split_ball)s ' path = os.path.normpath (self.expand ('%(install_root)s')) globs = [] for f in self._file_specs: @@ -416,7 +416,7 @@ self.system (''' rm -rf %(install_root)s cd %(builddir)s && %(install_command)s -rm -f %(install_root)s/%(packaging_suffix_dir)s%(prefix_dir)s/share/info/dir %(install_root)s/%(packaging_suffix_dir)s/%(prefix_dir)s/cross/info/dir %(install_root)s/%(packaging_suffix_dir)s%(prefix_dir)s/info/dir +rm -f %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/share/info/dir %(install_root)s%(packaging_suffix_dir)s/%(prefix_dir)s/cross/info/dir %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/info/dir ''') self.install_license () self.libtool_installed_la_fixups ()
--- a/gub/gup.py Fri Sep 07 15:27:54 2007 +0200 +++ b/gub/gup.py Fri Sep 07 15:56:51 2007 +0200 @@ -122,7 +122,7 @@ file = file[2:] dir = os.path.dirname (file) self.os_interface.file_sub ([('(-I|-L) */usr', - '''\\1%(root)s%(prefix_dir)s''' % locals () + '''\\1%(root)s%%(prefix_dir)s''' % locals () ),], '%(root)s/%(file)s' % locals ())
--- a/gub/settings.py Fri Sep 07 15:27:54 2007 +0200 +++ b/gub/settings.py Fri Sep 07 15:56:51 2007 +0200 @@ -78,7 +78,8 @@ # FIXME: rename to cross_root? self.cross_prefix = self.system_prefix + '/cross' self.installdir = self.targetdir + '/install' - self.local_prefix = self.alltargetdir + '/local' + self.prefix_dir + self.local_root = self.alltargetdir + '/local/root' + self.local_prefix = self.local_root + self.prefix_dir self.cross_distcc_bindir = self.alltargetdir + '/cross-distcc/bin' self.native_distcc_bindir = self.alltargetdir + '/native-distcc/bin'
--- a/gub/specs/glib.py Fri Sep 07 15:27:54 2007 +0200 +++ b/gub/specs/glib.py Fri Sep 07 15:56:51 2007 +0200 @@ -88,7 +88,7 @@ def install (self): toolpackage.ToolBuildSpec.install(self) - self.system ('rm %(install_root)s/%(packaging_suffix_dir)s%(prefix_dir)s/lib/charset.alias', + self.system ('rm %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/lib/charset.alias', ignore_errors=True) def get_build_dependencies (self):
--- a/gub/specs/guile.py Fri Sep 07 15:27:54 2007 +0200 +++ b/gub/specs/guile.py Fri Sep 07 15:56:51 2007 +0200 @@ -379,4 +379,4 @@ toolpackage.ToolBuildSpec.install (self) ## don't want local GUILE headers to interfere with compile. - self.system ("rm -rf %(install_root)s/%(packaging_suffix_dir)s%(prefix_dir)s/include/ %(install_root)s/%(packaging_suffix_dir)s%(prefix_dir)s/bin/guile-config ") + self.system ("rm -rf %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/include/ %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/bin/guile-config ")