File procmeter3-3.4a.patch of Package procmeter

Overview Repositories Revisions Requests Users Attributes Meta

File procmeter3-3.4a.patch of Package procmeter (Revision 798b540724c0ec22b64280d913780abb)

Currently displaying revision 798b540724c0ec22b64280d913780abb , Show latest

--- Makefile
+++ Makefile
@@ -15,13 +15,13 @@
 # Paths
 
 # INSTDIR - the default root directory for the package
-INSTDIR=/usr/local
+INSTDIR=/usr
 
 # MANDIR - the directory to install man pages to
-MANDIR=$(INSTDIR)/man
+MANDIR=$(INSTDIR)/share/man
 
 # LIB_PATH - the root dir for library files
-LIB_PATH=$(INSTDIR)/lib/X11/ProcMeter3
+LIB_PATH=$(INSTDIR)/lib/ProcMeter3
 
 # MOD_PATH - the path modules are stored in
 MOD_PATH=$(LIB_PATH)/modules
@@ -36,7 +36,7 @@
 
 # Program options
 
-CFLAGS=-g -O2 -Wall
+CFLAGS=$(RPM_OPT_FLAGS) -Wall
 LDFLAGS=-rdynamic
 
 PATHDEFS=-DINSTDIR=\"$(INSTDIR)\"   -DLIB_PATH=\"$(LIB_PATH)\" \
--- modules/Makefile
+++ modules/Makefile
@@ -14,8 +14,8 @@
 
 # Paths (overridden by main Makefile)
 
-INSTDIR=/usr/local
-LIB_PATH=$(INSTDIR)/lib/X11/ProcMeter3
+INSTDIR=/usr
+LIB_PATH=$(INSTDIR)/lib/ProcMeter3
 MOD_PATH=$(LIB_PATH)/modules
 
 # Programs
@@ -25,7 +25,7 @@
 
 # Program options (overridden by main Makefile)
 
-CFLAGS=-g -O2 -Wall
+CFLAGS=$(RPM_OPT_FLAGS) -Wall
 LDFLAGS=
 
 # Compilation targets
--- procmeterp.h
+++ procmeterp.h
@@ -29,7 +29,7 @@
 #endif
 
 #ifndef LIB_PATH
-#define LIB_PATH  INSTDIR  "/lib/X11/ProcMeter3"
+#define LIB_PATH  INSTDIR  "/lib/ProcMeter3"
 #endif
 #ifndef MOD_PATH
 #define MOD_PATH  LIB_PATH "/modules"
--- xaw/Makefile
+++ xaw/Makefile
@@ -23,7 +23,7 @@
 LDFLAGS=
 
 X_CFLAGS=-I/usr/X11/include -I/usr/X11R6/include
-X_LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib -lXaw -lXmu -lXt -lXext -lSM -lICE -lX11
+X_LDFLAGS=-L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lSM -lICE -lX11
 
 # Compilation targets

Places

File procmeter3-3.4a.patch of Package procmeter (Revision 798b540724c0ec22b64280d913780abb)

Places