diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-06 14:24:46 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-06 14:24:46 +0000 |
| commit | afa5975c1ec5bea51aa766d12cff13ec128d63ae (patch) | |
| tree | ab0edc1671541ef04fcbc2bf71331a05ab69173f | |
| parent | d751fd623bab6ee7e9bbb1ba89ee862db70c2af2 (diff) | |
| download | rpm-setup-afa5975c1ec5bea51aa766d12cff13ec128d63ae.tar rpm-setup-afa5975c1ec5bea51aa766d12cff13ec128d63ae.tar.gz rpm-setup-afa5975c1ec5bea51aa766d12cff13ec128d63ae.tar.bz2 rpm-setup-afa5975c1ec5bea51aa766d12cff13ec128d63ae.tar.xz rpm-setup-afa5975c1ec5bea51aa766d12cff13ec128d63ae.zip | |
revert %_host_cpu32 and create /etc/rpm/platform32 instead
(cf patch rpm-4.4.8-use-etc-platform32-when-linux32.patch in rpm)
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | macros.in | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 808e6bb..4ff89e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,8 @@ pkg_gdata = \ pkg_data_in = $(pkg_gdata:=.in) pkg_gconfig = \ - platform + platform \ + $(if $(CANONTARGETCPU32), platform32, ) pkg_scripts = \ brp-compress \ @@ -41,8 +42,6 @@ pkg_scripts_in = $(pkg_gscripts:=.in) BUILT_SOURCES = macros-perarch make_macrosfiles.sh rpmgenplatform -HOST_CPU32_MACRO = $(if $(CANONTARGETCPU32),%_host_cpu32 $(CANONTARGETCPU32),\#%_host_cpu32) - pkglibdir = @RPMVENDORDIR@ noinst_PROGRAMS = rpmeval @@ -81,7 +80,6 @@ edit = sed \ -e 's,@RPMSYSCONFDIR\@,$(RPMSYSCONFDIR),g'\ -e 's,@RPMOS\@,$(RPMOS),g' \ -e 's,@CANONTARGETCPU\@,$(CANONTARGETCPU),g' \ - -e 's,@HOST_CPU32_MACRO\@,$(HOST_CPU32_MACRO),g' \ -e 's,@RPMALLARCH\@,$(RPMALLARCH),g' %: %.in Makefile @@ -94,6 +92,9 @@ edit = sed \ platform: rpmgenplatform Makefile perl rpmgenplatform $(CANONTARGETCPU) > $@ +platform32: rpmgenplatform Makefile + perl rpmgenplatform $(CANONTARGETCPU32) > $@ + install-data-local: $(macrosfiles) $(pkg_gconfig) for i in $(RPMALLARCH); do \ $(mkinstalldirs) $(DESTDIR)$(RPMVENDORDIR)/$${i}-$(RPMOS); \ @@ -18,11 +18,6 @@ %_host %{_host_cpu}-%{_real_vendor}-%{_host_os} -# %_host_cpu32 is used instead of %_host_cpu when run through linux32 -# (cf patch rpm-4.4.8-use_host_cpu32-when-linux32.patch in rpm) -# (nb: %_host_cpu is set by /usr/lib/rpm/macros) -@HOST_CPU32_MACRO@ - #============================================================================== # Macro naming conventions (preliminary): # |