[Debian-hebrew-package] r805 - in /pkg/bidiv/trunk: Makefile debian/changelog debian/patches/makefile debian/patches/series

[tzafrir at users.alioth.debian.org]

Author: tzafrir
Date: Sat Apr 10 23:21:01 2010
New Revision: 805

URL: http://svn.debian.org/wsvn/debian-hebrew/?sc=1&rev=805
Log:
Patch makefile: simple Makefile fixes (originally in diff).

Added:
    pkg/bidiv/trunk/debian/patches/makefile
Modified:
    pkg/bidiv/trunk/Makefile
    pkg/bidiv/trunk/debian/changelog
    pkg/bidiv/trunk/debian/patches/series

Modified: pkg/bidiv/trunk/Makefile
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/Makefile?rev=805&op=diff
==============================================================================
--- pkg/bidiv/trunk/Makefile (original)
+++ pkg/bidiv/trunk/Makefile Sat Apr 10 23:21:01 2010
@@ -1,27 +1,28 @@
 PREFIX=/usr/local
 BIN_DIR=$(PREFIX)/bin
-MAN_PATH=$(PREFIX)/share/man
+MAN_PATH=$(PREFIX)/man
 CC_OPT_FLAGS=-O2 -Wall
 
 
-PKG_CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
-PKG_LDFLAGS=`fribidi-config --libs`
+CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
+LDFLAGS=`fribidi-config --libs`
 
 all: bidiv
 
-bidiv: bidiv.o term.o
-	$(CC) -o bidiv bidiv.o term.o $(PKG_LDFLAGS) $(LDFLAGS)
+bidiv: bidiv.o
+	$(CC) -o bidiv bidiv.o $(LDFLAGS)
 
 clean:
-	rm -f bidiv.o *~ bidiv term.o
+	rm -f bidiv.o *~
 
 clobber: clean
 	rm -f bidiv
 
 .c.o:
-	$(CC) -c $(PKG_CFLAGS) $(CFLAGS) $<
+	$(CC) -c $(CFLAGS) $<
 
 install: all
+	strip bidiv
 	cp bidiv $(BIN_DIR)
 	chmod 755 $(BIN_DIR)/bidiv
 	cp bidiv.1 $(MAN_PATH)/man1/bidiv.1

Modified: pkg/bidiv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/changelog?rev=805&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/changelog (original)
+++ pkg/bidiv/trunk/debian/changelog Sat Apr 10 23:21:01 2010
@@ -15,8 +15,9 @@
   * Missing ${misc:Depends} debhelper deps.
   * Patch hyphen_minus: hyphen/minus in man page (originally in diff).
   * Patch term_size_get: properly check terminal width (originally in diff).
+  * Patch makefile: simple Makefile fixes (originally in diff).
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 11 Apr 2010 01:57:03 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 11 Apr 2010 02:11:55 +0300
 
 bidiv (1.5-3) unstable; urgency=low
 

Added: pkg/bidiv/trunk/debian/patches/makefile
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/makefile?rev=805&op=file
==============================================================================
--- pkg/bidiv/trunk/debian/patches/makefile (added)
+++ pkg/bidiv/trunk/debian/patches/makefile Sat Apr 10 23:21:01 2010
@@ -1,0 +1,50 @@
+Description: simple Makefile fixes
+Author: Baruch Even <baruch at debian.org>
+
+Various minor Makefile fixes. Not separating to patches, as to avoid a set
+of conflicting patches.
+
+* Have man pages reside under /usr/*share*/man .
+* Avoid using the names CFLAGS and LDFLAGS, as cdbs may override them
+  (#376470).
+* Add the extra object term.c (should be part of patch term_size_get).
+* No stripping.
+
+--- bidiv-1.5.orig/Makefile
++++ bidiv-1.5/Makefile
+@@ -1,28 +1,27 @@
+ PREFIX=/usr/local
+ BIN_DIR=$(PREFIX)/bin
+-MAN_PATH=$(PREFIX)/man
++MAN_PATH=$(PREFIX)/share/man
+ CC_OPT_FLAGS=-O2 -Wall
+ 
+ 
+-CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
+-LDFLAGS=`fribidi-config --libs`
++PKG_CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
++PKG_LDFLAGS=`fribidi-config --libs`
+ 
+ all: bidiv
+ 
+-bidiv: bidiv.o
+-	$(CC) -o bidiv bidiv.o $(LDFLAGS)
++bidiv: bidiv.o term.o
++	$(CC) -o bidiv bidiv.o term.o $(PKG_LDFLAGS) $(LDFLAGS)
+ 
+ clean:
+-	rm -f bidiv.o *~
++	rm -f bidiv.o *~ bidiv term.o
+ 
+ clobber: clean
+ 	rm -f bidiv
+ 
+ .c.o:
+-	$(CC) -c $(CFLAGS) $<
++	$(CC) -c $(PKG_CFLAGS) $(CFLAGS) $<
+ 
+ install: all
+-	strip bidiv
+ 	cp bidiv $(BIN_DIR)
+ 	chmod 755 $(BIN_DIR)/bidiv
+ 	cp bidiv.1 $(MAN_PATH)/man1/bidiv.1

Modified: pkg/bidiv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/series?rev=805&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/patches/series (original)
+++ pkg/bidiv/trunk/debian/patches/series Sat Apr 10 23:21:01 2010
@@ -1,3 +1,4 @@
+makefile
 fribidi_019
 hyphen_minus
 term_size_get