[Pkg-wmaker-commits] [wmifinfo] 21/49: debian/patches: (makefile_add_ldflags.patch, makefile_patch.patch) Merge into one patch and revise.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 18 02:07:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmifinfo.
commit 4de0b26ec8418fe6cdc50e2670a2641c1aae1546
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Mon Dec 1 21:26:15 2014 -0600
debian/patches: (makefile_add_ldflags.patch, makefile_patch.patch) Merge into
one patch and revise.
---
debian/patches/makefile_add_ldflags.patch | 13 -------
debian/patches/makefile_patch.patch | 56 ++++++++++++++++++++++---------
debian/patches/series | 1 -
3 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/debian/patches/makefile_add_ldflags.patch b/debian/patches/makefile_add_ldflags.patch
deleted file mode 100644
index bf91837..0000000
--- a/debian/patches/makefile_add_ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Emanuele Rocca <ema at debian.org>
-Description: Use LDFLAGS in Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -33,7 +33,7 @@
- $(CC) $(COPTS) $(CFLAGS) -c $<
-
- $(BIN): $(FILES)
-- $(LD) -o $@ $(FILES) $(LDOPTS)
-+ $(LD) -o $@ $(FILES) $(LDOPTS) $(LDFLAGS)
-
- clean:
- rm -f *.o $(BIN) core ./.#* *.orig *.rej
diff --git a/debian/patches/makefile_patch.patch b/debian/patches/makefile_patch.patch
index 31b426f..d6f9e7c 100644
--- a/debian/patches/makefile_patch.patch
+++ b/debian/patches/makefile_patch.patch
@@ -1,7 +1,18 @@
-Author: Enrique Monge
-Description: Add CFLAGS, use rights PATHs and INSTALL instead of 'cp'
---- wmifinfo-0.09.orig/Makefile 2005-03-14 01:28:31.000000000 -0600
-+++ wmifinfo-0.09/Makefile 2008-10-28 09:31:44.000000000 -0600
+Description: Various Makefile updates
+ This patch includes elements of the original makefile_patch.patch by Enrique
+ Monge and makefile_add_ldflags.patch by Emanuele Rocca.
+ .
+ Rename COPTS and LDOTPS to the more standard CFLAGS and LIBS. Also use
+ CPPFLAGS when compiling and LDFLAGS when linking.
+ .
+ Use INSTALL instead of cp. Also honor DESTDIR.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Author: Enrique Monge <emonge at debian.org.sv>
+Author: Emanuele Rocca <ema at debian.org>
+Last-Update: 2014-12-01
+
+--- a/Makefile
++++ b/Makefile
@@ -2,7 +2,7 @@
# Set this to 'y' if you want support for reading the link quality
# of nowiresneeded 1148 PCMCIA or Swallow cards
@@ -11,35 +22,50 @@ Description: Add CFLAGS, use rights PATHs and INSTALL instead of 'cp'
##################################################################
-@@ -13,9 +13,11 @@ VERSION=0.09
+@@ -13,34 +13,36 @@
CC = gcc
LD = gcc
-COPTS = -Wall -O2 -D'VERSION="$(VERSION)"' -D'NAME="$(NAME)"'
-+COPTS = -D'VERSION="$(VERSION)"' -D'NAME="$(NAME)"'
- LDOPTS = -lX11 -L/usr/X11R6/lib -lXpm -lXext
+-LDOPTS = -lX11 -L/usr/X11R6/lib -lXpm -lXext
-BINDIR = /usr/local/bin
-+BINDIR = $(DESTDIR)/usr/bin/
++CFLAGS = -Wall -O2 -D'VERSION="$(VERSION)"' -D'NAME="$(NAME)"'
++LIBS = -lX11 -lXpm -lXext
++PREFIX = /usr/local
++BINDIR = $(PREFIX)/bin
+INSTALL=/usr/bin/install
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
BIN = wmifinfo
- FILES = wmifinfo.o xutils.o
-@@ -28,7 +30,7 @@ endif
+-FILES = wmifinfo.o xutils.o
++FILES = wmifinfo.o xutils.o
+
+ ifeq ("$(ENABLE_NWN_SUPPORT)", "y")
+ FILES += nwn.o
+-COPTS += -DENABLE_NWN_SUPPORT
++CFLAGS += -DENABLE_NWN_SUPPORT
+ endif
+
all: $(BIN)
- .c.o:
+-.c.o:
- $(CC) $(COPTS) -c $<
-+ $(CC) $(COPTS) $(CFLAGS) -c $<
++.c.o:
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
$(BIN): $(FILES)
- $(LD) -o $@ $(FILES) $(LDOPTS)
-@@ -37,7 +39,7 @@ clean:
+- $(LD) -o $@ $(FILES) $(LDOPTS)
++ $(LD) $(LDFLAGS) -o $@ $(FILES) $(LIBS)
+
+ clean:
rm -f *.o $(BIN) core ./.#* *.orig *.rej
install:
- cp $(BIN) $(BINDIR)
-+ $(INSTALL_PROGRAM) $(BIN) $(BINDIR)
++ $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)
dist: clean
rm -rf /tmp/wmifinfo-$(VERSION)
+ cd .. && cp -a wmifinfo /tmp/wmifinfo-$(VERSION)
+ cd /tmp && tar --exclude CVS -zcvf wmifinfo-$(VERSION).tgz wmifinfo-$(VERSION)/
+-
diff --git a/debian/patches/series b/debian/patches/series
index c165d91..b728c09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
wmifinfo-timeval_fix.patch
makefile_patch.patch
-makefile_add_ldflags.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmifinfo.git
More information about the Pkg-wmaker-commits
mailing list