diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | macros.in | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 18888e9..0116577 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,6 +88,7 @@ edit = sed \ -e 's,@RPMSYSCONFDIR\@,$(RPMSYSCONFDIR),g'\ -e 's,@RPMOS\@,$(RPMOS),g' \ -e 's,@CANONTARGETCPU\@,$(CANONTARGETCPU),g' \ + -e 's,@CANONTARGETGNU\@,$(CANONTARGETGNU),g' \ -e 's,@RPMALLARCH\@,$(RPMALLARCH),g' %: %.in Makefile diff --git a/configure.ac b/configure.ac index a92f018..1573b39 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS([string.h rpm/rpmmacro.h rpm/rpmlib.h rpm/rpmio.h rpm/rpmtag.h]) CANONTARGETCPU=${target_cpu} +CANONTARGETGNU=-gnu case "${target_cpu}" in *86|athlon|k6|pentium*) @@ -73,6 +74,7 @@ RPMALLARCH="${RPMALLARCH} noarch" AC_SUBST(RPMALLARCH) AC_SUBST(CANONTARGETCPU) AC_SUBST(CANONTARGETCPU32) +AC_SUBST(CANONTARGETGNU) # # get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os @@ -14,7 +14,7 @@ %_vendor @RPMVENDOR@ -%_gnu -gnu +%_gnu @CANONTARGETGNU@ %_target_platform %{_target_cpu}-%{_real_vendor}-%{_target_os}%{?_gnu} %_host %{_host_cpu}-%{_real_vendor}-%{_host_os} |