projects / packages / faces.git / blame
| Commit | Line | Data |
|---|---|---|
| 1b6059d0 JR |
1 | --- faces/compface/Makefile.make Wed Oct 23 22:28:06 1991 |
| 2 | +++ faces/compface/Makefile Mon Mar 22 12:30:29 1999 | |
| 3 | @@ -22,9 +22,9 @@ | |
| 4 | # BINDIR, LIBDIR, and MANDIR are expected to be overridden by the | |
| 5 | # calling Makefile | |
| 6 | ||
| 7 | -BINDIR = /usr/local/bin | |
| 8 | -LIBDIR = /usr/local/lib | |
| 9 | -MANDIR = /usr/manl | |
| 10 | +BINDIR = /usr/bin | |
| 11 | +LIBDIR = /usr/lib | |
| 12 | +MANDIR = /usr/man | |
| 13 | ||
| 14 | NAME = compface | |
| 15 | UNNAME = uncompface | |
| 16 | @@ -42,7 +42,7 @@ | |
| 17 | ||
| 18 | CC = cc | |
| 19 | CDEFS = $(SYSV) | |
| 20 | -CCOMP = -g | |
| 21 | +CCOMP = $(RPM_OPT_FLAGS) | |
| 22 | CFLAGS = $(CDEFS) $(CCOMP) | |
| 23 | ||
| 24 | all: $(NAME) $(UNNAME) | |
| 25 | --- faces/filters/Makefile.make Wed Oct 23 22:26:14 1991 | |
| 26 | +++ faces/filters/Makefile Mon Mar 22 12:30:29 1999 | |
| 27 | @@ -16,7 +16,7 @@ | |
| 28 | # Makefile | |
| 29 | ||
| 30 | #-------------------------------------------------------------------------- | |
| 31 | -BINDIR = /usr/local/bin | |
| 32 | +BINDIR = /usr/bin | |
| 33 | #-------------------------------------------------------------------------- | |
| 34 | # Not all machines have the index() string library function. If you | |
| 35 | # don't have this function then you should uncomment the NOINDEX | |
| 36 | @@ -34,7 +34,7 @@ | |
| 37 | ||
| 38 | CC = cc | |
| 39 | CDEFS = $(NOINDEX) $(SYSV) | |
| 40 | -CCOMP = -g | |
| 41 | +CCOMP = $(RPM_OPT_FLAGS) | |
| 42 | CFLAGS = $(CCOMP) $(CDEFS) | |
| 43 | ||
| 44 | all: $(BINARIES) | |
| 45 | @@ -55,9 +55,9 @@ | |
| 46 | rm -f *.o $(BINARIES) | |
| 47 | ||
| 48 | install: $(BINARIES) | |
| 49 | - install -s -m 751 icon2ikon $(BINDIR) | |
| 50 | - install -s -m 751 ikon2icon $(BINDIR) | |
| 51 | - install -s -m 751 rs2icon $(BINDIR) | |
| 52 | + install -s -m 755 icon2ikon $(BINDIR) | |
| 53 | + install -s -m 755 ikon2icon $(BINDIR) | |
| 54 | + install -s -m 755 rs2icon $(BINDIR) | |
| 55 | install -c -m 755 fs2ikon $(BINDIR) | |
| 56 | install -c -m 755 fs2xbm $(BINDIR) | |
| 57 | install -c -m 755 ikon2xbm $(BINDIR) | |
| 58 | --- faces/Makefile.dist.make Sun Nov 24 18:55:28 1991 | |
| 59 | +++ faces/Makefile.dist Mon Mar 22 12:30:39 1999 | |
| 60 | @@ -77,7 +77,7 @@ | |
| 61 | # be uncommented and set appropriately. Note that the value must be | |
| 62 | # a single directory name, not a colon separated list of paths. | |
| 63 | # | |
| 64 | -FACEDIR = /usr/local/faces | |
| 65 | +FACEDIR = /usr/lib/faces | |
| 66 | CFACEDIR = -DFACEDIR=\"$(FACEDIR)\" | |
| 67 | #------------------------------------------------------------------------ | |
| 68 | # It is possible to determine what type of monitoring faces does at | |
| 69 | @@ -259,7 +259,8 @@ | |
| 70 | # two lines should be uncommented, and set appropriately. | |
| 71 | # | |
| 72 | #X11INCDIR = -I$(OPENWINHOME)/include | |
| 73 | -#X11LIBDIR = -L$(OPENWINHOME)/lib | |
| 74 | +X11INCDIR = -I/usr/X11R6/include | |
| 75 | +X11LIBDIR = -L/usr/X11R6/lib | |
| 76 | #------------------------------------------------------------------------ | |
| 77 | # If you are compiling the XView version, then the following two lines | |
| 78 | # should be uncommented, and set appropriately. | |
| 79 | @@ -272,10 +273,10 @@ | |
| 80 | # Default locations where faces files will be installed. | |
| 81 | # You might wish to alter these values. | |
| 82 | # | |
| 83 | -BINDIR = /usr/local/bin | |
| 84 | -LIBDIR = /usr/local/lib | |
| 85 | +BINDIR = /usr/bin | |
| 86 | +LIBDIR = /usr/lib | |
| 87 | MANDIR = /usr/man | |
| 88 | -MANSECT = l | |
| 89 | +MANSECT = 1 | |
| 90 | ||
| 91 | # | |
| 92 | # Options for submakes | |
| 93 | @@ -302,7 +303,7 @@ | |
| 94 | $(SELTYPE) $(SGIDEF) $(SPOOLDIR) $(SPOOLFILE) $(SYSV) \ | |
| 95 | $(TTEXT) $(TOPIX) $(UPDATE) $(USE_BZERO) $(USE_GETWD) \ | |
| 96 | $(X11R3) $(X11INCDIR) $(XVIEWINCDIR) $(DEBUG) | |
| 97 | -CCOMP = -O | |
| 98 | +CCOMP = $(RPM_OPT_FLAGS) | |
| 99 | CFLAGS = $(CCOMP) $(CDEFS) | |
| 100 | # | |
| 101 | #======================================================================= |