build: fix some oddities in solaris/

target_* is always wrong for FRR because we are not a compiler.  We only
use host_* and build_*.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/solaris/Makefile.am b/solaris/Makefile.am
index 5633991d1a3626cba2c7325db9e3e61218cf935e..165908204513c328022b975be91e2fe92c8a0ef4 100644 (file)
--- a/solaris/Makefile.am
+++ b/solaris/Makefile.am
@@ -8,7 +8,7 @@
 # derived variables.
 pkg_names = daemons dev doc libs smf
 pkg_frr_daemons = zebra bgpd ospfd ospf6d ripd ripngd
-pkg_name_rev = @PACKAGE_VERSION@-@CONFDATE@-@target_os@-@target_cpu@
+pkg_name_rev = @PACKAGE_VERSION@-@CONFDATE@-@host_os@-@host_cpu@
 pkg_depends = $(pkg_names:%=depend.%)
 pkg_packages = $(pkg_names:%=@PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg)
 pkg_pkginfos = $(pkg_names:%=pkginfo.%.full)
@@ -37,13 +37,12 @@ edit = $(SED) \
        -e 's,@enable_vty_group\@,$(enable_vty_group),g' \
        -e 's,@frr_statedir\@,$(frr_statedir),g' \
        -e 's,[@]PACKAGE_NAME[@],@PACKAGE_NAME@,g' \
-       -e 's,[@]PACKAGE_TARNAME[@],@PACKAGE_TARNAME@,g' \
-       -e 's,[@]PACKAGE_VERSION[@],@PACKAGE_VERSION@,g' \
-       -e 's,[@]PACKAGE_BUGREPORT[@],@PACKAGE_BUGREPORT@,g' \
-       -e 's,[@]CONFDATE[@],@CONFDATE@,g' \
-       -e 's,[@]target_cpu[@],$(target_cpu),g' \
-       -e 's,[@]target_host[@],$(target_host),g' \
-       -e 's,[@]target_os[@],$(target_os),g'
+       -e 's,[@]PACKAGE_TARNAME[@],@PACKAGE_TARNAME@,g' \
+       -e 's,[@]PACKAGE_VERSION[@],@PACKAGE_VERSION@,g' \
+       -e 's,[@]PACKAGE_BUGREPORT[@],@PACKAGE_BUGREPORT@,g' \
+       -e 's,[@]CONFDATE[@],@CONFDATE@,g' \
+       -e 's,[@]host_cpu[@],$(host_cpu),g' \
+       -e 's,[@]host_os[@],$(host_os),g'
 
 # common options for pkgmk
 pkg_make_vars = exec_prefix=@exec_prefix@ prefix=@prefix@ \

diff --git a/solaris/pkginfo.tmpl.in b/solaris/pkginfo.tmpl.in
index 89a281ceb6824cc33c637792d8aaa72877e108fd..ffbf9b9cef650050362a91942ba7c2e10d8b33e1 100644 (file)
--- a/solaris/pkginfo.tmpl.in
+++ b/solaris/pkginfo.tmpl.in
@@ -1,4 +1,4 @@
-ARCH="@target_cpu@"
+ARCH="@host_cpu@"
 CATEGORY="system"
 VERSION="@PACKAGE_VERSION@,REV=@CONFDATE@"
 VENDOR="http://www.frrouting.org/"