rpms/nethack/devel nethack-3.4.3-makefile.patch, 1.3, 1.4 nethack.spec, 1.4, 1.5

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15456

Modified Files:
	nethack-3.4.3-makefile.patch nethack.spec 
Log Message:
- Regress hardcoding of lib64 path in makefile, and add correct path using %{_lib} during %prep


nethack-3.4.3-makefile.patch:

Index: nethack-3.4.3-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack-3.4.3-makefile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-3.4.3-makefile.patch	8 Sep 2005 06:08:18 -0000	1.3
+++ nethack-3.4.3-makefile.patch	8 Sep 2005 06:21:35 -0000	1.4
@@ -7,7 +7,7 @@
 -# CFLAGS = -O2 -fomit-frame-pointer -I../include
 -# LFLAGS = -L/usr/X11R6/lib
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include
-+LFLAGS = -L/usr/X11R6/lib -L/usr/X11R6/lib64
++LFLAGS = -L/usr/X11R6/lib
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
  # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack.spec	8 Sep 2005 05:50:33 -0000	1.4
+++ nethack.spec	8 Sep 2005 06:21:35 -0000	1.5
@@ -54,6 +54,10 @@
 %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
         doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
 
+# Point the linker in the right direction
+%{__sed} -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \
+        src/Makefile util/Makefile
+
 
 %build
 make all