← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/packeth/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/fix_Makefile.patch

  • Committer: Bazaar Package Importer
  • Author(s): David Paleino
  • Date: 2008-02-21 10:42:00 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080221104200-xsp0zp1ujbsqsj7a
Tags: 1.6-1
http://bugs.debian.org/466497
* New upstream release
* debian/control:
  - "Ethernet" not capitalized in descriptions (Closes: #466497)
  - debhelper dependency bumped to 6 (also debian/compat)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix_Makefile.patch
1
 
Index: packeth/Makefile
2
 
===================================================================
3
 
--- packeth.orig/Makefile       2007-11-17 16:56:49.000000000 +0100
4
 
+++ packeth/Makefile    2007-11-17 17:03:13.000000000 +0100
5
 
@@ -19,19 +19,20 @@
6
 
 # Makefile for building packETH
7
 
 
8
 
 SHELL = /bin/sh
9
 
-prefix = /usr/local
10
 
+prefix = /usr
11
 
 includedir = /usr/src/include
12
 
 
13
 
 INSTALL = /usr/bin/install -c
14
 
 INSTALL_DATA = ${INSTALL} -m 644
15
 
-INSTALL_PREFIX = /usr/local
16
 
+INSTALL_PREFIX = /usr
 
1
--- packeth.orig/src/Makefile
 
2
+++ packeth/src/Makefile
 
3
@@ -28,8 +28,8 @@
17
4
 
18
5
 CC = gcc
19
6
 CPPFLAGS =  -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 
20
 
 LDFLAGS = 
21
 
 CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations 
 
7
-LDFLAGS = 
 
8
-CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations 
 
9
+#LDFLAGS =
 
10
+#CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations
22
11
 #LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXi -lXext -lX11 -lm -lpthread -lgthread
23
 
-LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lpthread -lgthread-2.0
24
 
+#LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lpthread -lgthread-2.0
25
 
+LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lglib-2.0 -lpthread -lgthread-2.0
26
 
 
27
 
 SOURCES = \
28
 
        main.c \
29
 
@@ -47,7 +48,7 @@
 
12
 #LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lpthread -lgthread-2.0
 
13
 LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lglib-2.0 -lpthread -lgthread-2.0
 
14
@@ -48,7 +48,7 @@
30
15
 
31
16
 OBJECTS =  main.o support.o interface.o callbacks.o function_send.o function.o loadpacket.o savepacket.o 
32
17
 
35
20
 
36
21
 COMPILE = $(CC) $(CFLAGS) $(CPPFLAGS)
37
22
 
38
 
@@ -60,9 +61,9 @@
39
 
        $(COMPILE) -c $<
40
 
 
41
 
 install: $(PROGRAM)
42
 
-       cp $(PROGRAM) $(INSTALL_PREFIX)/bin/$(PROGRAM)
43
 
-       if [ ! -d $(INSTALL_PREFIX)/share/pixmaps/$(PROGRAM) ]; then mkdir -p $(INSTALL_PREFIX)/share/pixmaps/$(PROGRAM); fi
44
 
-       cp pixmaps/* $(INSTALL_PREFIX)/share/pixmaps/$(PROGRAM)
45
 
+       $(INSTALL) $(PROGRAM) $(DESTDIR)/$(INSTALL_PREFIX)/bin/$(PROGRAM)
46
 
+       if [ ! -d $(DESTDIR)/$(INSTALL_PREFIX)/share/pixmaps/$(PROGRAM) ]; then mkdir -p $(DESTDIR)/$(INSTALL_PREFIX)/share/pixmaps/$(PROGRAM); fi
47
 
+       $(INSTALL) -m 644 pixmaps/* $(DESTDIR)/$(INSTALL_PREFIX)/share/pixmaps/$(PROGRAM)
48
 
 
49
 
 clean:
50
 
        rm -f $(OBJECTS) $(PROGRAM)