diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-02-01 20:18:23 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-02-01 20:18:23 +0200 |
| commit | 7a77e1fd9fcd657fec32704628b77f6104cf5103 (patch) | |
| tree | 2f8852dac03ecbd22a7ce46fd4152ef952f4b159 | |
| parent | 15f33b33e62a703105671dff675689265da88b16 (diff) | |
| download | librpm-tizen-7a77e1fd9fcd657fec32704628b77f6104cf5103.tar.gz librpm-tizen-7a77e1fd9fcd657fec32704628b77f6104cf5103.tar.bz2 librpm-tizen-7a77e1fd9fcd657fec32704628b77f6104cf5103.zip | |
Move platform specific macros under RPMCONFIGDIR/platform/
- reduce the clutter in RPMCONFIGDIR, nicer for packaging too..
| -rw-r--r-- | Makefile.am | 26 | ||||
| -rwxr-xr-x | installplatform | 6 | ||||
| -rw-r--r-- | lib/rpmrc.c | 2 |
3 files changed, 18 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 1269d1017..4fc6c5000 100644 --- a/Makefile.am +++ b/Makefile.am @@ -248,19 +248,19 @@ install-data-local: # XXX to appease distcheck we need to remove "stuff" here... uninstall-local: - @rm -rf $(DESTDIR)/$(rpmconfigdir)/*-* - rm -f $(DESTDIR)$(rpmlibexecdir)/rpmu - rm -f $(DESTDIR)$(rpmlibexecdir)/rpme - rm -f $(DESTDIR)$(rpmlibexecdir)/rpmt - rm -f $(DESTDIR)$(rpmlibexecdir)/rpmv - rm -f $(DESTDIR)$(bindir)/rpmquery - rm -f $(DESTDIR)$(bindir)/rpmbuild - rm -f $(DESTDIR)$(bindir)/rpmu - rm -f $(DESTDIR)$(bindir)/rpmsign - rm -f $(DESTDIR)$(bindir)/rpme - rm -f $(DESTDIR)$(bindir)/rpmverify - rm -f $(DESTDIR)$(bindir)/rpmdb - rm -f $(DESTDIR)$(bindir)/rpmi + @rm -rf $(DESTDIR)/$(rpmconfigdir)/platform + @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmu + @rm -f $(DESTDIR)$(rpmlibexecdir)/rpme + @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmt + @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmv + @rm -f $(DESTDIR)$(bindir)/rpmquery + @rm -f $(DESTDIR)$(bindir)/rpmbuild + @rm -f $(DESTDIR)$(bindir)/rpmu + @rm -f $(DESTDIR)$(bindir)/rpmsign + @rm -f $(DESTDIR)$(bindir)/rpme + @rm -f $(DESTDIR)$(bindir)/rpmverify + @rm -f $(DESTDIR)$(bindir)/rpmdb + @rm -f $(DESTDIR)$(bindir)/rpmi MAINTAINERCLEANFILES = ChangeLog diff --git a/installplatform b/installplatform index 8124e6f12..5e9bd7382 100755 --- a/installplatform +++ b/installplatform @@ -2,6 +2,7 @@ DESTDIR="${DESTDIR:-/}" pkglibdir="${pkglibdir:-/usr/lib/rpm}" +platformdir="${pkglibdir}/platform" RPMRC="${1:-rpmrc}" MACROS="${2:-macros}" @@ -45,7 +46,7 @@ for SUBST in $SUBSTS ; do TARGET=`echo $target | sed -e $SUBST` LIB=lib - PPD="${DESTDIR}/${pkglibdir}/${ARCH}-${OS}" + PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}" [ -d $PPD ] || mkdir $PPD @@ -104,6 +105,7 @@ for SUBST in $SUBSTS ; do CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`" + mkdir -p "${DESTDIR}/${platformdir}" cat $PLATFORM \ | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \ -e "s,$arch,$CANONARCH," \ @@ -119,7 +121,7 @@ for SUBST in $SUBSTS ; do done -{ cd ${DESTDIR}/${pkglibdir} +{ cd ${DESTDIR}/${platformdir} [ -L noarch-${OS} ] && rm -f noarch-${OS} 2>/dev/null mkdir -p noarch-${OS} sed -e "/^%_arch/s,${arch},noarch," ${arch}-${OS}/macros | grep -v '^%optflags' > noarch-${OS}/macros diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 2b25197a9..da1ce1459 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -33,7 +33,7 @@ static const char *defrcfiles = const char * macrofiles = #ifndef MACROFILES RPMCONFIGDIR "/macros" - ":" RPMCONFIGDIR "/%{_target}/macros" + ":" RPMCONFIGDIR "/platform/%{_target}/macros" ":" SYSCONFDIR "/rpm/macros.*" ":" SYSCONFDIR "/rpm/macros" ":" SYSCONFDIR "/rpm/%{_target}/macros" |