Archives
Archives
| From: | "Kacper Kowalik (xarthisius)" <xarthisius@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sci-visualization/spectromatic/files: spectromatic-1.0-makefile.patch |
| Date: | Fri, 27 Aug 2010 07:21:54 |
| Message-Id: | 20100827072150.EFFAE20051@flycatcher.gentoo.org |
| 1 | xarthisius 10/08/27 07:21:50 |
| 2 | |
| 3 | Modified: spectromatic-1.0-makefile.patch |
| 4 | Log: |
| 5 | Respect CC and LDFLAGS wrt bug 334715. Thanks to Diego for the report. Clean ebuild. |
| 6 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.2 sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch?rev=1.2&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch?rev=1.2&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch?r1=1.1&r2=1.2 |
| 14 | |
| 15 | Index: spectromatic-1.0-makefile.patch |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch,v |
| 18 | retrieving revision 1.1 |
| 19 | retrieving revision 1.2 |
| 20 | diff -u -r1.1 -r1.2 |
| 21 | --- spectromatic-1.0-makefile.patch 26 Nov 2008 10:48:58 -0000 1.1 |
| 22 | +++ spectromatic-1.0-makefile.patch 27 Aug 2010 07:21:50 -0000 1.2 |
| 23 | @@ -1,10 +1,14 @@ |
| 24 | ---- spectromatic-1.0/Makefile 2002-03-30 05:17:34.000000000 +0000 |
| 25 | -+++ spectromatic-1.0.new/Makefile 2008-11-26 10:43:15.910065276 +0000 |
| 26 | +Respect LDFLAGS, CFLAGS, CC #334715 |
| 27 | +Fix install paths |
| 28 | + |
| 29 | +--- Makefile |
| 30 | ++++ Makefile |
| 31 | @@ -1,33 +1,29 @@ |
| 32 | # Makefile for spectromatic |
| 33 | |
| 34 | -CFLAGS = -O2 -Wall |
| 35 | - LIBS = -lgsl -lgslcblas -lpng -lm |
| 36 | +-LIBS = -lgsl -lgslcblas -lpng -lm |
| 37 | ++LIBS = -lpng `pkg-config --libs gsl` |
| 38 | DESTDIR = |
| 39 | TOPLEVEL_HOME = /usr |
| 40 | |
| 41 | @@ -23,10 +27,11 @@ |
| 42 | - install -o root -g root -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/man/man1 |
| 43 | - |
| 44 | all: $(OBJ) |
| 45 | - $(CC) -o $(TARGET) $(OBJ) $(LIBS) |
| 46 | +- $(CC) -o $(TARGET) $(OBJ) $(LIBS) |
| 47 | - strip $(TARGET) |
| 48 | ++ $(CC) $(LDFLAGS) -o $(TARGET) $(OBJ) $(LIBS) |
| 49 | + |
| 50 | -+install: all |
| 51 | ++install: $(TARGET) |
| 52 | + mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin |
| 53 | + mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1 |
| 54 | + install -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin |