From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Dec 2011 17:12:13 +0000 (+0100)
Subject: bison: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=531618b73b1acb55e2da042ad84a2106c501c523;p=people%2Famarx%2Fipfire-3.x.git

bison: Make package work on x86_64.
---

diff --git a/bison/bison.nm b/bison/bison.nm
index 733595702..4b777edee 100644
--- a/bison/bison.nm
+++ b/bison/bison.nm
@@ -5,7 +5,7 @@
 
 name       = bison
 version    = 2.5
-release    = 1
+release    = 2
 
 groups     = Development/Tools
 url        = http://www.gnu.org/software/bison/
@@ -28,18 +28,22 @@ build
 		echo '#define YYENABLE_NLS 1' >> lib/config.h
 	end
 
+	build_cmds
+		cd lib
+		gcc -shared -Wl,-soname,liby.so.%{version} \
+			-o liby.so.%{version} %{CFLAGS} main.o yyerror.o
+	end
+
 	test
 		make check
 	end
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/usr/lib
-		cd %{DIR_APP}/lib && gcc -shared -Wl,-soname,liby.so.%{version} \
-			-o liby.so.%{version} %{CFLAGS} main.o yyerror.o
-		cd %{DIR_APP}/lib && install -v liby.so.%{version} \
-			%{BUILDROOT}/usr/lib/liby.so.%{version}
-		ln -vsf liby.so.%{version} %{BUILDROOT}/usr/lib/liby.so.2
-		ln -vsf liby.so.2 %{BUILDROOT}/usr/lib/liby.so
+		mkdir -pv %{BUILDROOT}%{libdir}
+		cd lib
+		install -v liby.so.%{version} %{BUILDROOT}%{libdir}/liby.so.%{version}
+		ln -vsf liby.so.%{version} %{BUILDROOT}%{libdir}/liby.so.2
+		ln -vsf liby.so.2 %{BUILDROOT}%{libdir}/liby.so
 	end
 end