| 1 |
hasufell 12/12/26 20:38:24 |
| 2 |
|
| 3 |
Added: verynice-1.1-build.patch |
| 4 |
Log: |
| 5 |
fix stuff! |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/verynice/files/verynice-1.1-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/verynice/files/verynice-1.1-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/verynice/files/verynice-1.1-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: verynice-1.1-build.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Wed Dec 26 19:46:44 UTC 2012 |
| 19 |
Subject: build system |
| 20 |
|
| 21 |
respect flags, add LDFLAGS to linker line |
| 22 |
fix install rules |
| 23 |
|
| 24 |
--- Makefile |
| 25 |
+++ Makefile |
| 26 |
@@ -15,13 +15,15 @@ |
| 27 |
# along with this program; if not, write to the Free Software |
| 28 |
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 |
|
| 30 |
-CC = gcc |
| 31 |
+CC ?= gcc |
| 32 |
|
| 33 |
|
| 34 |
RPM_BUILD_ROOT= |
| 35 |
|
| 36 |
# PREFIX is usually either /usr or /usr/local |
| 37 |
PREFIX=/usr/local |
| 38 |
+BINDIR=$(PREFIX)/sbin |
| 39 |
+ETCDIR=/etc |
| 40 |
TARGET=linux |
| 41 |
|
| 42 |
|
| 43 |
@@ -32,8 +34,8 @@ |
| 44 |
VERSION=1.1 |
| 45 |
|
| 46 |
#CFLAGS= -I../include/ -O3 -Wimplicit |
| 47 |
-CFLAGS= -I../include/ -g -Wimplicit -DPREFIX=\"$(PREFIX)\" -DTARGET_$(TARGET) -DVERSION=\"$(VERSION)\" |
| 48 |
-LINK = gcc |
| 49 |
+CFLAGS += -Wimplicit |
| 50 |
+CPPFLAGS = -I../include/ -DPREFIX=\"$(PREFIX)\" -DTARGET_$(TARGET) -DVERSION=\"$(VERSION)\" |
| 51 |
AG = /home3/sdh4/anagram/ag_unix_dev/ag |
| 52 |
|
| 53 |
|
| 54 |
@@ -55,20 +57,15 @@ |
| 55 |
(cd .. ; tar cvzf verynice-$(VERSION).tar.gz verynice/ ) |
| 56 |
|
| 57 |
install: |
| 58 |
- $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/sbin |
| 59 |
- $(INSTALL) verynice $(RPM_BUILD_ROOT)$(PREFIX)/sbin |
| 60 |
- if [ $(PREFIX) = "/usr" ]; then \ |
| 61 |
- mv -f $(RPM_BUILD_ROOT)/etc/verynice.conf $(RPM_BUILD_ROOT)/etc/verynice.conf~ ; \ |
| 62 |
- $(INSTALL) verynice.conf $(RPM_BUILD_ROOT)/etc ; \ |
| 63 |
- else \ |
| 64 |
- $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/etc ; \ |
| 65 |
- mv -f $(RPM_BUILD_ROOT)$(PREFIX)/etc/verynice.conf $(RPM_BUILD_ROOT)$(PREFIX)/etc/verynice.conf~ ; \ |
| 66 |
- $(INSTALL) -m 644 verynice.conf $(RPM_BUILD_ROOT)$(PREFIX)/etc ; \ |
| 67 |
- fi |
| 68 |
+ $(INSTALL) -d $(RPM_BUILD_ROOT)$(BINDIR) |
| 69 |
+ $(INSTALL) verynice $(RPM_BUILD_ROOT)$(BINDIR) |
| 70 |
+ $(INSTALL) -d $(RPM_BUILD_ROOT)$(ETCDIR) |
| 71 |
+ $(INSTALL) -m 644 verynice.conf $(RPM_BUILD_ROOT)$(ETCDIR) |
| 72 |
$(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share |
| 73 |
$(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc |
| 74 |
$(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION) |
| 75 |
- $(INSTALL) -m 644 verynice.html $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION) |
| 76 |
+ $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)/html |
| 77 |
+ $(INSTALL) -m 644 verynice.html $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)/html |
| 78 |
$(INSTALL) -m 644 README $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION) |
| 79 |
$(INSTALL) -m 644 README.SYN $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION) |
| 80 |
$(INSTALL) -m 644 COPYING $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION) |
| 81 |
@@ -95,7 +92,7 @@ |
| 82 |
$(AG) $* |
| 83 |
|
| 84 |
verynice: verynice.o config.o linklist.o stringstack.o |
| 85 |
- $(LINK) -g -o $@ $^ -lm |
| 86 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm |
Archives