Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.2:Update
procmeter
procmeter3-3.4a.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File procmeter3-3.4a.patch of Package procmeter
--- 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= PATHDEFS=-DINSTDIR=\"$(INSTDIR)\" -DLIB_PATH=\"$(LIB_PATH)\" \ @@ -125,35 +125,35 @@ install : @[ -f procmeter3 ] || [ -f gprocmeter3 ] || [ -f procmeter3-log ] || [ -f procmeter3-lcd ] || \ (echo "*** Run 'make all' or 'make procmeter3' or 'make gprocmeter3' or 'make procmeter3-log' or 'make procmeter3-lcd' first." ; exit 1) - install -d $(LIB_PATH) - install -d $(MOD_PATH) - install -d $(RC_PATH) + install -d $(DESTDIR)$(LIB_PATH) + install -d $(DESTDIR)$(MOD_PATH) + install -d $(DESTDIR)$(RC_PATH) # $(MAKE) -C modules install MOD_PATH=$(MOD_PATH) LIB_PATH=$(LIB_PATH) # - install -d $(INSTDIR)/bin - [ ! -f procmeter3 ] || install -m 755 procmeter3 $(INSTDIR)/bin + install -d $(DESTDIR)$(INSTDIR)/bin + [ ! -f procmeter3 ] || install -m 755 procmeter3 $(DESTDIR)$(INSTDIR)/bin @[ -f procmeter3 ] || (echo "" ; echo "*** The procmeter3 program has not been installed (it does not exist)." ; echo "") - [ ! -f gprocmeter3 ] || install -m 755 gprocmeter3 $(INSTDIR)/bin + [ ! -f gprocmeter3 ] || install -m 755 gprocmeter3 $(DESTDIR)$(INSTDIR)/bin @[ -f gprocmeter3 ] || (echo "" ; echo "*** The gprocmeter3 program has not been installed (it does not exist)." ; echo "") - [ ! -f procmeter3-log ] || install -m 755 procmeter3-log $(INSTDIR)/bin + [ ! -f procmeter3-log ] || install -m 755 procmeter3-log $(DESTDIR)$(INSTDIR)/bin @[ -f procmeter3-log ] || (echo "" ; echo "*** The procmeter3-log program has not been installed (it does not exist)." ; echo "") - [ ! -f procmeter3-lcd ] || install -m 755 procmeter3-lcd $(INSTDIR)/bin + [ ! -f procmeter3-lcd ] || install -m 755 procmeter3-lcd $(DESTDIR)$(INSTDIR)/bin @[ -f procmeter3-lcd ] || (echo "" ; echo "*** The procmeter3-lcd program has not been installed (it does not exist)." ; echo "") # - install -d $(MANDIR)/man1 - install -d $(MANDIR)/man5 - [ ! -f procmeter3 ] || install -m 644 man/procmeter3.1 $(MANDIR)/man1 - [ ! -f procmeter3-log ] || install -m 644 man/procmeter3-log.1 $(MANDIR)/man1 - [ ! -f procmeter3-lcd ] || install -m 644 man/procmeter3-lcd.1 $(MANDIR)/man1 - [ ! -f gprocmeter3 ] || install -m 644 man/gprocmeter3.1 $(MANDIR)/man1 - install -m 644 man/procmeterrc.5 $(MANDIR)/man5 - install -m 644 man/procmeter3_modules.1 $(MANDIR)/man1 + install -d $(DESTDIR)$(MANDIR)/man1 + install -d $(DESTDIR)$(MANDIR)/man5 + [ ! -f procmeter3 ] || install -m 644 man/procmeter3.1 $(DESTDIR)$(MANDIR)/man1 + [ ! -f procmeter3-log ] || install -m 644 man/procmeter3-log.1 $(DESTDIR)$(MANDIR)/man1 + [ ! -f procmeter3-lcd ] || install -m 644 man/procmeter3-lcd.1 $(DESTDIR)$(MANDIR)/man1 + [ ! -f gprocmeter3 ] || install -m 644 man/gprocmeter3.1 $(DESTDIR)$(MANDIR)/man1 + install -m 644 man/procmeterrc.5 $(DESTDIR)$(MANDIR)/man5 + install -m 644 man/procmeter3_modules.1 $(DESTDIR)$(MANDIR)/man1 # - [ ! -f $(RC_PATH)/.procmeterrc ] || mv $(RC_PATH)/.procmeterrc $(RC_PATH)/procmeterrc - @[ ! -f $(RC_PATH)/procmeterrc ] || (echo "" ; echo "*** The $(RC_PATH)/procmeterrc file has not been installed (it already exists)." ; echo "") - [ -f $(RC_PATH)/procmeterrc ] || install -m 644 procmeterrc.install $(RC_PATH)/procmeterrc - install -m 644 procmeterrc.install $(RC_PATH) + [ ! -f $(DESTDIR)$(RC_PATH)/.procmeterrc ] || mv $(DESTDIR)$(RC_PATH)/.procmeterrc $(DESTDIR)$(RC_PATH)/procmeterrc + @[ ! -f $(DESTDIR)$(RC_PATH)/procmeterrc ] || (echo "" ; echo "*** The $(DESTDIR)$(RC_PATH)/procmeterrc file has not been installed (it already exists)." ; echo "") + [ -f $(DESTDIR)$(RC_PATH)/procmeterrc ] || install -m 644 procmeterrc.install $(DESTDIR)$(RC_PATH)/procmeterrc + install -m 644 procmeterrc.install $(DESTDIR)$(RC_PATH) # - install -d $(LIB_PATH)/include - install -m 644 procmeter.h $(LIB_PATH)/include + install -d $(DESTDIR)$(LIB_PATH)/include + install -m 644 procmeter.h $(DESTDIR)$(LIB_PATH)/include --- 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 @@ -61,10 +61,12 @@ .PHONY : install install : - install -d $(MOD_PATH) - install -d $(LIB_PATH)/example + install -d $(DESTDIR)$(MOD_PATH) + install -d $(DESTDIR)$(LIB_PATH)/example for module in *.so ; do \ - [ $$module = template.so ] || install -m 755 $$module $(MOD_PATH) ;\ + [ $$module = template.so ] || install -m 755 $$module $(DESTDIR)$(MOD_PATH) ;\ done - install -m 644 README $(LIB_PATH)/example - install -m 644 template.c $(LIB_PATH)/example + install -m 644 README $(DESTDIR)$(LIB_PATH)/example + install -m 644 template.c $(DESTDIR)$(LIB_PATH)/example + + --- 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
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
