diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2006-11-28 20:29:04 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2006-11-28 20:29:04 +0000 |
| commit | 89d947a864c04c69f8ebf64fbe75284bb66a212d (patch) | |
| tree | b50b800de15fb3a148549323e6d5aff12012e715 /games-mud/mcl | |
| parent | moved tcltk USE flag over to separate tk and tcl flags, see bug #17808 (diff) | |
| download | gentoo-2-89d947a864c04c69f8ebf64fbe75284bb66a212d.tar.gz gentoo-2-89d947a864c04c69f8ebf64fbe75284bb66a212d.tar.bz2 gentoo-2-89d947a864c04c69f8ebf64fbe75284bb66a212d.zip | |
Fix install paths, bug #156488
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'games-mud/mcl')
| -rw-r--r-- | games-mud/mcl/ChangeLog | 6 | ||||
| -rw-r--r-- | games-mud/mcl/files/mcl-0.53.00-libdir.patch | 31 | ||||
| -rw-r--r-- | games-mud/mcl/mcl-0.53.00.ebuild | 14 |
3 files changed, 44 insertions, 7 deletions
diff --git a/games-mud/mcl/ChangeLog b/games-mud/mcl/ChangeLog index 061a1783dcd2..7d89f91f99b2 100644 --- a/games-mud/mcl/ChangeLog +++ b/games-mud/mcl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-mud/mcl # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/ChangeLog,v 1.14 2006/10/20 01:11:22 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/ChangeLog,v 1.15 2006/11/28 20:29:04 nyhm Exp $ + + 28 Nov 2006; Tristan Heaven <nyhm@gentoo.org> + +files/mcl-0.53.00-libdir.patch, mcl-0.53.00.ebuild: + Fix install paths, bug #156488 20 Oct 2006; Tristan Heaven <nyhm@gentoo.org> mcl-0.53.00.ebuild: Remove gnuconfig_update diff --git a/games-mud/mcl/files/mcl-0.53.00-libdir.patch b/games-mud/mcl/files/mcl-0.53.00-libdir.patch new file mode 100644 index 000000000000..c9f1341f9bbc --- /dev/null +++ b/games-mud/mcl/files/mcl-0.53.00-libdir.patch @@ -0,0 +1,31 @@ +--- Makefile.in ++++ Makefile.in +@@ -15,7 +15,7 @@ + LDFLAGS=@LDFLAGS@ + LIBS=@LIBS@ + prefix=@prefix@ +-INSTALL_ROOT=@INSTALL_ROOT@ ++libdir=@libdir@ + COMPILED_BY=@COMPILED_BY@ + MODULES=@WITH_PERL@ @WITH_PYTHON@ + +@@ -117,12 +117,13 @@ + $(CC) -c $(MCL_CFLAGS) $(PYTHON_CPPFLAGS) $< -o $@ + + install: $(EXE) +- $(INSTALL) -d $(INSTALL_ROOT)$(prefix)/{bin,lib/mcl/{auto,contrib,plugins,sys}} +- $(INSTALL) $(EXE) $(INSTALL_ROOT)$(prefix)/bin +- $(INSTALL) o/plugins/*.so $(INSTALL_ROOT)$(prefix)/lib/mcl/plugins || : # There may be no plugins to install +- $(INSTALL) samples/auto/*.* $(INSTALL_ROOT)$(prefix)/lib/mcl/auto/ # The *.* is desired, not a typo +- $(INSTALL) samples/contrib/*.* $(INSTALL_ROOT)$(prefix)/lib/mcl/contrib/ +- $(INSTALL) samples/sys/*.* $(INSTALL_ROOT)$(prefix)/lib/mcl/sys/ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/bin ++ $(INSTALL) -d $(DESTDIR)$(libdir)/mcl/{auto,contrib,plugins,sys} ++ $(INSTALL) $(EXE) $(DESTDIR)$(prefix)/bin ++ -$(INSTALL) o/plugins/*.so $(DESTDIR)$(libdir)/mcl/plugins ++ $(INSTALL) samples/auto/*.* $(DESTDIR)$(libdir)/mcl/auto/ ++ $(INSTALL) samples/contrib/*.* $(DESTDIR)$(libdir)/mcl/contrib/ ++ $(INSTALL) samples/sys/*.* $(DESTDIR)$(libdir)/mcl/sys/ + + + include admin/Makefile diff --git a/games-mud/mcl/mcl-0.53.00.ebuild b/games-mud/mcl/mcl-0.53.00.ebuild index 9f5b32537b6c..bdf0fd38650a 100644 --- a/games-mud/mcl/mcl-0.53.00.ebuild +++ b/games-mud/mcl/mcl-0.53.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/mcl-0.53.00.ebuild,v 1.13 2006/10/20 01:11:22 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/mcl-0.53.00.ebuild,v 1.14 2006/11/28 20:29:04 nyhm Exp $ inherit eutils games @@ -20,10 +20,12 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-fPIC.patch" - epatch "${FILESDIR}/${PV}-vc.patch" - epatch "${FILESDIR}/${P}-gcc34.patch" - epatch "${FILESDIR}/${PV}-dynacomplete.patch" + epatch \ + "${FILESDIR}"/${P}-fPIC.patch \ + "${FILESDIR}"/${PV}-vc.patch \ + "${FILESDIR}"/${P}-gcc34.patch \ + "${FILESDIR}"/${PV}-dynacomplete.patch \ + "${FILESDIR}"/${P}-libdir.patch sed -i \ -e "/MCL_LIBRARY_PATH/ s:/usr/lib/mcl:${GAMES_LIBDIR}/${PN}:" \ @@ -40,7 +42,7 @@ src_compile() { } src_install () { - emake INSTALL_ROOT="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install || die "emake install failed" dodoc \ doc/{Changes,Chat,Embedded,Examples,Modules,Plugins,README,TODO} \ || die "dodoc failed" |