summaryrefslogtreecommitdiff
blob: 5a3b0b509383419951890ca2f16478731c409d9f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
diff -NurdB tuxpaint-0.9.15b-orig/Makefile tuxpaint-0.9.15b/Makefile
--- tuxpaint-0.9.15b-orig/Makefile	2005-11-27 01:44:15.000000000 -0500
+++ tuxpaint-0.9.15b/Makefile	2006-02-14 08:00:18.000000000 -0500
@@ -17,7 +17,7 @@
 
 # Where to install things:
 
-PREFIX=/usr/local
+PREFIX=/usr
 
 
 # Root directory to place files when creating packages.
@@ -61,13 +61,14 @@
 
 ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/share/pixmaps
 X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps
-GNOME_PREFIX=`gnome-config --prefix`
-KDE_PREFIX=`kde-config --install apps --expandvars`
-KDE_ICON_PREFIX=`kde-config --install icon --expandvars`
+GNOME_PREFIX=
+KDE_PREFIX=
+KDE_ICON_PREFIX=
 
 
 # Locale files
 
+ENABLE_GETTEXT=0
 LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale
 # LOCALE_PREFIX=/usr/share/locale
 
@@ -95,7 +96,7 @@
 
 # The entire set of CFLAGS:
 
-CFLAGS=-O2 -W -Wall -fno-common -ffast-math \
+CFLAGS += -W -Wall -fno-common \
 	-Wcast-align -Wredundant-decls \
 	-Wbad-function-cast -Wwrite-strings \
 	-Waggregate-return \
@@ -116,7 +117,10 @@
 
 # "make" with no arguments builds the program and man page from sources:
 
-all:	tuxpaint translations
+all:	tuxpaint
+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
+		make translations; \
+	fi
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo
@@ -205,10 +209,13 @@
 # to do this as superuser ("root"))
 
 install:	install-bin install-data install-man install-doc \
-		install-icon install-gettext install-importscript \
+		install-icon install-importscript \
 		install-default-config install-example-stamps \
 		install-example-starters \
 		install-gnome install-kde install-kde-icons
+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
+		make install-gettext; \
+	fi
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo
@@ -481,9 +488,9 @@
 	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps; \
 	 cp data/images/icon.png $(PKG_ROOT)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
 	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
-	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \
-	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
-	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
+	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/applications; \
+	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/; \
+	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
 	fi
 
 
@@ -552,9 +559,6 @@
 	@install -d $(ICON_PREFIX)
 	@cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png
 	@chmod 644 $(ICON_PREFIX)/tuxpaint.png
-	@install -d $(X11_ICON_PREFIX)
-	@cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm
-	@chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm
 
 
 # Install the program: