]>
Commit | Line | Data |
---|---|---|
664c22ce | 1 | --- blobAndConquer-1.09/makefile~ 2009-10-26 12:41:03.000000000 +0000 |
2 | +++ blobAndConquer-1.09/makefile 2009-10-26 12:48:03.000000000 +0000 | |
3 | @@ -1,6 +1,5 @@ | |
4 | PROG = blobAndConquer | |
5 | PAKNAME = blobAndConquer.pak | |
6 | -DOCS = doc/* | |
7 | ICONS = icons/ | |
8 | ||
9 | PAKDIRS = data gfx music sound textures | |
10 | @@ -13,7 +12,6 @@ | |
11 | PREFIX = $(DESTDIR)/usr | |
12 | BINDIR = $(PREFIX)/bin/ | |
13 | DATADIR = $(PREFIX)/share/blobAndConquer/ | |
14 | -DOCDIR = $(PREFIX)/share/doc/$(PROG)/ | |
15 | ICONDIR = $(PREFIX)/share/icons/hicolor/ | |
16 | MENUDIR = $(PREFIX)/share/applications/ | |
17 | LOCALEDIR = $(PREFIX)/share/locale/ | |
18 | @@ -23,7 +21,7 @@ | |
19 | CXXFLAGS += -Wmissing-format-attribute -Wmissing-noreturn | |
20 | CXXFLAGS += -Wdisabled-optimization | |
21 | CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV) | |
22 | -CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)/index.html\" -Wall -pedantic | |
23 | +CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -Wall -pedantic | |
24 | CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" -g | |
25 | LIBPATH = -L/usr/X11/lib -L/usr/X11R6/lib | |
26 | LIBS = -lGL -lGLU `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz | |
27 | @@ -112,7 +110,6 @@ | |
28 | ||
29 | mkdir -p $(BINDIR) | |
30 | mkdir -p $(DATADIR) | |
31 | - mkdir -p $(DOCDIR) | |
32 | mkdir -p $(ICONDIR)/16x16/apps | |
33 | mkdir -p $(ICONDIR)/32x32/apps | |
34 | mkdir -p $(ICONDIR)/64x64/apps | |
35 | @@ -121,7 +118,6 @@ | |
36 | install -m 755 $(PROG) $(BINDIR)/$(PROG) | |
37 | install -m 644 $(PAKNAME) $(DATADIR)/$(PAKNAME) | |
38 | ||
39 | - cp -r $(DOCS) $(DOCDIR) | |
40 | cp $(ICONS)$(PROG).png $(ICONDIR)32x32/apps/ | |
41 | cp $(ICONS)$(PROG).desktop $(MENUDIR) | |
42 |