Mercurial > gub
changeset 39:8520eba3b74f
fixup dirs at make install time
| author | janneke <janneke@gnu.org> |
|---|---|
| date | Fri, 25 Nov 2005 20:08:47 +0100 |
| parents | 4c3fba517489 |
| children | 28c87358b804 |
| files | specs/download.py specs/framework.py specs/gub.py |
| diffstat | 3 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/specs/download.py Fri Nov 25 18:18:18 2005 +0100 +++ b/specs/download.py Fri Nov 25 20:08:47 2005 +0100 @@ -2,8 +2,10 @@ return 'ftp://ftp.gtk.org/pub/gtk/v%(gtk_version)s/%(name)s-%(version)s.tar.%(format)s' def gnu (): + # FIXME: find complete GNU mirror # base = 'ftp://dl.xs4all.nl/pub/mirror/gnu' - base = 'ftp://sunsite.dk/pub/gnu' + # base = 'ftp://sunsite.dk/pub/gnu' + base = 'ftp://ftp.gnu.org/pub/gnu' return base + '/%(name)s/%(name)s-%(version)s.tar.%(format)s' def freetype ():
--- a/specs/framework.py Fri Nov 25 18:18:18 2005 +0100 +++ b/specs/framework.py Fri Nov 25 20:08:47 2005 +0100 @@ -60,13 +60,13 @@ class Fontconfig (gub.Target_package): def configure_command (self): cmd = gub.Target_package.configure_command (self) - ## fixme. + # FIXME: system dir vs packaging install ''' \ --with-default-fonts=@WINDIR@\\fonts \ --with-add-fonts=@INSTDIR@\\usr\\share\\gs\\fonts \ --with-freetype-config="/usr/bin/freetype-config \ ---prefix=%(installdir)s/usr \ ---exec-prefix=%(installdir)s/usr \ +--prefix=%(systemdir)s/usr \ +--exec-prefix=%(systemdir)s/usr \ " '''
--- a/specs/gub.py Fri Nov 25 18:18:18 2005 +0100 +++ b/specs/gub.py Fri Nov 25 20:08:47 2005 +0100 @@ -251,11 +251,24 @@ def installdir (self): # the usr/ works around a fascist check in libtool ##return self.settings.installdir + "/" + self.name () + "-root/usr" + # FIXME: system dir vs packaging install # no packages for now return self.settings.systemdir + '/usr' def install_command (self): - return 'make prefix=%(installdir)s install' + return '''make install \ +prefix=%(installdir)s \ +exec_prefix=%(installdir)s \ +bindir=%(installdir)s/bin \ +infodir=%(installdir)s/share/info \ +mandir=%(installdir)s/share/man \ +libdir=%(installdir)s/lib \ +sysconfdir=%(installdir)s/etc \ +includedir=%(installdir)s/include \ +tooldir=%(installdir)s \ +gcc_tooldir=%(installdir)s \ +libexecdir=%(installdir)s/lib \ +''' def configure (self): self.system ('mkdir -p %(builddir)s')