SPECS (AC-branch): nx.spec - merge build fixes from 1.11

aredridel aredridel at pld-linux.org
Wed Jun 7 21:44:12 CEST 2006


Author: aredridel                    Date: Wed Jun  7 19:44:12 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge build fixes from 1.11

---- Files affected:
SPECS:
   nx.spec (1.9.2.1 -> 1.9.2.2) 

---- Diffs:

================================================================
Index: SPECS/nx.spec
diff -u SPECS/nx.spec:1.9.2.1 SPECS/nx.spec:1.9.2.2
--- SPECS/nx.spec:1.9.2.1	Wed Jun  7 21:41:36 2006
+++ SPECS/nx.spec	Wed Jun  7 21:44:06 2006
@@ -81,7 +81,8 @@
 %configure
 sed -i -e "s|LDFLAGS     = |LDFLAGS = -fPIC -L/usr/X11R6/%{_lib}|" Makefile
 %{__make} \
-	CC="%{__cc}"
+	CC="%{__cc}" \
+	MAKEDEPEND=/bin/true
 
 cd ../nx-X11
 %{__make} \
@@ -98,7 +99,9 @@
 %{__make}
 
 cd ../nxviewer
-xmkmf -a
+ln -s ../nx-X11/config config
+ln -s ../nx-X11/exports/ exports
+xmkmf -a .
 %{__make} \
 	EXTRA_LIBRARIES="-L%{_libdir} -L../nx-X11/exports/lib" \
 	CC="%{__cc}" \
@@ -156,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9.2.2  2006/06/07 19:44:06  aredridel
+- merge build fixes from 1.11
+
 Revision 1.9.2.1  2006/06/07 19:41:36  aredridel
 - merge changes in 1.10 (perl -> sed)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nx.spec?r1=1.9.2.1&r2=1.9.2.2&f=u



More information about the pld-cvs-commit mailing list