diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk
--- netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk	2011-06-03 12:06:03.993675429 -0400
+++ netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk	2011-06-03 18:54:48.073675374 -0400
@@ -76,15 +76,15 @@ LDLIBSOPTIONS=
 
 dist/linux-amd64.so: ${OBJECTFILES}
 	${MKDIR} -p dist
-	${LINK.c} -shared -o dist/linux-amd64.so -s ${OBJECTFILES} ${LDLIBSOPTIONS} 
+	${LINK.c} -shared -o dist/linux-amd64.so ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c 
 	${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
-	$(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+	$(COMPILE.c) -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
 
 ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c 
 	${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
-	$(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+	$(COMPILE.c) -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
 
 # Subprojects
 .build-subprojects:
diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk
--- netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk	2011-06-03 12:06:03.993675429 -0400
+++ netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk	2011-06-03 19:25:53.595454815 -0400
@@ -29,11 +29,11 @@
 	${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o
 
 # C Compiler Flags
-CFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CFLAGS=$(RPM_OPT_FLAGS) -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 
 # CC Compiler Flags
-CCFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CXXFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CCFLAGS=$(RPM_OPT_FLAGS) -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CXXFLAGS=$(RPM_OPT_FLAGS) -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 
 # Fortran Compiler Flags
 FFLAGS=
@@ -46,15 +46,15 @@ LDLIBSOPTIONS=
 
 dist/linux.so: ${OBJECTFILES}
 	${MKDIR} -p dist
-	${LINK.c} -shared -o dist/linux.so -s ${OBJECTFILES} ${LDLIBSOPTIONS} 
+	${LINK.c} -shared -o dist/linux.so ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c 
 	${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
-	$(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+	$(COMPILE.c) -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
 
 ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c 
 	${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
-	$(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+	$(COMPILE.c) -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
 
 # Subprojects
 .build-subprojects:
diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk
--- netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk	2011-06-03 12:06:03.993675429 -0400
+++ netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk	2011-06-03 19:28:00.716455062 -0400
@@ -29,11 +29,11 @@
 	${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o
 
 # C Compiler Flags
-CFLAGS=
+CFLAGS=$(RPM_OPT_FLAGS) -fPIC
 
 # CC Compiler Flags
-CCFLAGS=
-CXXFLAGS=
+CCFLAGS=$(RPM_OPT_FLAGS) -fPIC
+CXXFLAGS=$(RPM_OPT_FLAGS) -fPIC
 
 # Fortran Compiler Flags
 FFLAGS=