| 1 |
Description: simple Makefile fixes |
| 2 |
Author: Baruch Even <[email protected]> |
| 3 |
|
| 4 |
Various minor Makefile fixes. Not separating to patches, as to avoid a set |
| 5 |
of conflicting patches. |
| 6 |
|
| 7 |
* Have man pages reside under /usr/*share*/man . |
| 8 |
* Avoid using the names CFLAGS and LDFLAGS, as cdbs may override them |
| 9 |
(#376470). |
| 10 |
* Add the extra object term.c (should be part of patch term_size_get). |
| 11 |
* No stripping. |
| 12 |
|
| 13 |
--- bidiv-1.5.orig/Makefile |
| 14 |
+++ bidiv-1.5/Makefile |
| 15 |
@@ -1,28 +1,27 @@ |
| 16 |
PREFIX=/usr/local |
| 17 |
BIN_DIR=$(PREFIX)/bin |
| 18 |
-MAN_PATH=$(PREFIX)/man |
| 19 |
+MAN_PATH=$(PREFIX)/share/man |
| 20 |
CC_OPT_FLAGS=-O2 -Wall |
| 21 |
|
| 22 |
|
| 23 |
-CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags` |
| 24 |
-LDFLAGS=`fribidi-config --libs` |
| 25 |
+PKG_CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags` |
| 26 |
+PKG_LDFLAGS=`fribidi-config --libs` |
| 27 |
|
| 28 |
all: bidiv |
| 29 |
|
| 30 |
-bidiv: bidiv.o |
| 31 |
- $(CC) -o bidiv bidiv.o $(LDFLAGS) |
| 32 |
+bidiv: bidiv.o term.o |
| 33 |
+ $(CC) -o bidiv bidiv.o term.o $(PKG_LDFLAGS) $(LDFLAGS) |
| 34 |
|
| 35 |
clean: |
| 36 |
- rm -f bidiv.o *~ |
| 37 |
+ rm -f bidiv.o *~ bidiv term.o |
| 38 |
|
| 39 |
clobber: clean |
| 40 |
rm -f bidiv |
| 41 |
|
| 42 |
.c.o: |
| 43 |
- $(CC) -c $(CFLAGS) $< |
| 44 |
+ $(CC) -c $(PKG_CFLAGS) $(CFLAGS) $< |
| 45 |
|
| 46 |
install: all |
| 47 |
- strip bidiv |
| 48 |
cp bidiv $(BIN_DIR) |
| 49 |
chmod 755 $(BIN_DIR)/bidiv |
| 50 |
cp bidiv.1 $(MAN_PATH)/man1/bidiv.1 |