RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm lua Date: 03-Mar-2010 16:43:08 Branch: HEAD Handle: 2010030315430701 Modified files: lua .cvsignore Makefile.am rpm configure.ac rpm/macros macros.in Log: - lua: work around lua/luac install with cva Attic name collisiobns. Summary: Revision Changes Path 1.7 +2 -2 lua/.cvsignore 1.40 +16 -8 lua/Makefile.am 2.430 +1 -1 rpm/configure.ac 1.28 +3 -2 rpm/macros/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: lua/.cvsignore ============================================================================ $ cvs diff -u -r1.6 -r1.7 .cvsignore --- lua/.cvsignore 30 Dec 2009 17:21:11 -0000 1.6 +++ lua/.cvsignore 3 Mar 2010 15:43:08 -0000 1.7 @@ -8,5 +8,5 @@ *.lcd *.lo bin2c -lua -luac +rpmlua +rpmluac @@ . patch -p0 <<'@@ .' Index: lua/Makefile.am ============================================================================ $ cvs diff -u -r1.39 -r1.40 Makefile.am --- lua/Makefile.am 31 Dec 2009 14:48:26 -0000 1.39 +++ lua/Makefile.am 3 Mar 2010 15:43:08 -0000 1.40 @@ -24,18 +24,18 @@ -I$(srcdir) pkgbindir = @USRLIBRPM@/bin -pkgbin_PROGRAMS = lua luac -noinst_PROGRAMS = bin2c +pkgbin_PROGRAMS = rpmlua rpmluac +noinst_PROGRAMS = bin2c pkglibdir = @USRLIBRPM@/lib pkglib_LTLIBRARIES = liblua.la -lua_SOURCES = lua.c -lua_CFLAGS = -lua_LDADD = liblua.la -luac_SOURCES = luac.c print.c -luac_CFLAGS = -luac_LDADD = liblua.la +rpmlua_SOURCES = lua.c +rpmlua_CFLAGS = +rpmlua_LDADD = liblua.la +rpmluac_SOURCES = luac.c print.c +rpmluac_CFLAGS = +rpmluac_LDADD = liblua.la bin2c_SOURCES = bin2c.c liblua_la_SOURCES = @@ -313,3 +313,11 @@ clean-local: -rm -f $(builddir)/local/llocal_lua.c +# XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install. +# XXX CVS has lua/luac sub-directories in the Attic that collide with the +# XXX lua/luac executable names when using cvs update. +install-exec-hook: rpmlua rpmluac + $(__RM) -f $(pkgbindir)/lua + $(__LN) rpmlua $(pkgbindir)/lua + $(__RM) -f $(pkgbindir)/luac + $(__LN) rpmluac $(pkgbindir)/luac @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.429 -r2.430 configure.ac --- rpm/configure.ac 17 Jan 2010 12:16:30 -0000 2.429 +++ rpm/configure.ac 3 Mar 2010 15:43:07 -0000 2.430 @@ -478,7 +478,7 @@ AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH) AC_PATH_PROG(__INSTALL_INFO, install-info, /sbin/install-info, $MYPATH) AC_PATH_PROG(__LDCONFIG, ldconfig, /sbin/ldconfig, $MYPATH) -AC_PATH_PROG(__LUA, lua, %{_bindir}/lua, $MYPATH) +AC_PATH_PROG(__LN, ln, /bin/ln, $MYPATH) AC_PATH_PROG(__LZMA, lzma, %{_bindir}/lzma, $MYPATH) AC_PATH_PROG(__LZOP, lzop, %{_bindir}/lzop, $MYPATH) AC_PATH_PROG(__MAKE, make, %{_bindir}/make, $MYPATH) @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in ============================================================================ $ cvs diff -u -r1.27 -r1.28 macros.in --- rpm/macros/macros.in 21 Feb 2010 17:11:10 -0000 1.27 +++ rpm/macros/macros.in 3 Mar 2010 15:43:08 -0000 1.28 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.27 2010/02/21 17:11:10 jbj Exp $ +# $Id: macros.in,v 1.28 2010/03/03 15:43:08 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -48,6 +48,7 @@ %__cp %{_usrlibrpmbin}/cp %__find %{_usrlibrpmbin}/find %__grep %{_usrlibrpmbin}/grep +%__lua %{_usrlibrpmbin}/lua %__mtree %{_usrlibrpmbin}/mtree %__rc %{_usrlibrpmbin}/rc %__wget %{_usrlibrpmbin}/wget @@ -76,7 +77,7 @@ %__install @__INSTALL@ %__install_info @__INSTALL_INFO@ %__ldconfig @__LDCONFIG@ -%__lua @__LUA@ +%__ln @__LN@ %__ln_s @LN_S@ %__lzma @__LZMA@ %__lzop @__LZOP@ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
