Lines 1-46
Link Here
|
1 |
--- Makefile.orig 2014-03-29 15:11:25 UTC |
1 |
--- Makefile.orig 2016-11-02 14:44:56 UTC |
2 |
+++ Makefile |
2 |
+++ Makefile |
3 |
@@ -4,27 +4,27 @@ |
3 |
@@ -39,7 +39,7 @@ PREFIX ?= /usr |
4 |
BINPREFIX = $(PREFIX) |
4 |
DESTDIR ?= |
|
|
5 |
BINPREFIX ?= $(PREFIX) |
6 |
BINDIR ?= ${BINPREFIX}/bin |
7 |
-INSTALLDIR ?= ${PREFIX}/share/games/atanks |
8 |
+INSTALLDIR ?= ${PREFIX}/share/atanks |
5 |
|
9 |
|
6 |
BINDIR = ${BINPREFIX}bin/ |
|
|
7 |
-INSTALLDIR = ${PREFIX}share/games/atanks |
8 |
+INSTALLDIR = ${PREFIX}share/atanks |
9 |
|
10 |
|
10 |
export VERSION |
11 |
# ------------------------------------ |
11 |
export PREFIX |
12 |
@@ -232,7 +232,6 @@ ifeq (YES,$(DEBUG)) |
12 |
export INSTALLDIR |
13 |
endif |
13 |
|
14 |
|
14 |
FILENAME=atanks-${VERSION} |
15 |
else |
15 |
-INSTALL=$(PREFIX)bin/install -c |
16 |
- CXXFLAGS := -march=native ${CXXFLAGS} -O2 |
16 |
+INSTALL=install |
17 |
endif |
17 |
DISTCOMMON=atanks/*.dat atanks/COPYING atanks/README atanks/TODO atanks/Changelog atanks/BUGS atanks/*.txt |
|
|
18 |
-INCOMMON=COPYING README TODO Changelog *.txt unicode.dat |
19 |
+INCOMMON=unicode.dat |
20 |
|
18 |
|
21 |
all: |
|
|
22 |
- FLAGS=-DLINUX $(MAKE) -C src |
23 |
+ FLAGS=-DMACOSX $(MAKE) -C src -f Makefile.bsd |
24 |
|
19 |
|
25 |
install: |
20 |
@@ -255,7 +254,7 @@ DISTCOMMON := \ |
26 |
mkdir -p $(DESTDIR)${BINDIR} |
21 |
atanks/*.dat atanks/COPYING atanks/README atanks/TODO \ |
|
|
22 |
atanks/Changelog atanks/BUGS atanks/*.txt |
23 |
|
24 |
-INCOMMON := COPYING README TODO Changelog *.txt unicode.dat |
25 |
+INCOMMON := credits.txt unicode.dat |
26 |
|
27 |
# ------------------------------------ |
28 |
# Default target |
29 |
@@ -301,11 +300,11 @@ endif |
30 |
# ------------------------------------ |
31 |
install: $(TARGET) |
32 |
$(INSTALL) -d $(DESTDIR)${BINDIR} |
27 |
- $(INSTALL) -m 755 atanks $(DESTDIR)${BINDIR} |
33 |
- $(INSTALL) -m 755 atanks $(DESTDIR)${BINDIR} |
28 |
- mkdir -p $(DESTDIR)/usr/share/applications |
|
|
29 |
- $(INSTALL) -m 644 atanks.desktop $(DESTDIR)/usr/share/applications |
30 |
- mkdir -p $(DESTDIR)/usr/share/icons/hicolor/48x48/apps |
31 |
- $(INSTALL) -m 644 atanks.png $(DESTDIR)/usr/share/icons/hicolor/48x48/apps |
32 |
+ $(BSD_INSTALL_PROGRAM) atanks $(DESTDIR)${BINDIR} |
34 |
+ $(BSD_INSTALL_PROGRAM) atanks $(DESTDIR)${BINDIR} |
33 |
+ mkdir -p $(DESTDIR)/usr/local/share/applications |
35 |
$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/applications |
34 |
+ $(INSTALL) -m 644 atanks.desktop $(DESTDIR)/usr/local/share/applications |
36 |
- $(INSTALL) -m 644 atanks.desktop $(DESTDIR)$(PREFIX)/share/applications |
35 |
+ mkdir -p $(DESTDIR)/usr/local/share/icons/hicolor/48x48/apps |
37 |
+ $(BSD_INSTALL_DATA) atanks.desktop $(DESTDIR)$(PREFIX)/share/applications |
36 |
+ $(INSTALL) -m 644 atanks.png $(DESTDIR)/usr/local/share/icons/hicolor/48x48/apps |
38 |
$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps |
37 |
mkdir -p $(DESTDIR)${INSTALLDIR} |
39 |
- $(INSTALL) -m 644 atanks.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps |
38 |
mkdir -p $(DESTDIR)${INSTALLDIR}/button |
40 |
+ $(BSD_INSTALL_DATA) atanks.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps |
39 |
mkdir -p $(DESTDIR)${INSTALLDIR}/misc |
41 |
$(INSTALL) -d $(DESTDIR)${INSTALLDIR} |
40 |
@@ -35,16 +35,16 @@ |
42 |
$(INSTALL) -d $(DESTDIR)${INSTALLDIR}/button |
41 |
mkdir -p $(DESTDIR)${INSTALLDIR}/tankgun |
43 |
$(INSTALL) -d $(DESTDIR)${INSTALLDIR}/misc |
42 |
mkdir -p $(DESTDIR)${INSTALLDIR}/title |
44 |
@@ -316,16 +315,16 @@ install: $(TARGET) |
43 |
mkdir -p $(DESTDIR)${INSTALLDIR}/text |
45 |
$(INSTALL) -d $(DESTDIR)${INSTALLDIR}/tankgun |
|
|
46 |
$(INSTALL) -d $(DESTDIR)${INSTALLDIR}/title |
47 |
$(INSTALL) -d $(DESTDIR)${INSTALLDIR}/text |
44 |
- $(INSTALL) -m 644 $(INCOMMON) $(DESTDIR)${INSTALLDIR} |
48 |
- $(INSTALL) -m 644 $(INCOMMON) $(DESTDIR)${INSTALLDIR} |
45 |
- $(INSTALL) -m 644 button/* $(DESTDIR)${INSTALLDIR}/button |
49 |
- $(INSTALL) -m 644 button/* $(DESTDIR)${INSTALLDIR}/button |
46 |
- $(INSTALL) -m 644 misc/* $(DESTDIR)${INSTALLDIR}/misc |
50 |
- $(INSTALL) -m 644 misc/* $(DESTDIR)${INSTALLDIR}/misc |
Lines 51-66
Link Here
|
51 |
- $(INSTALL) -m 644 tankgun/* $(DESTDIR)${INSTALLDIR}/tankgun |
55 |
- $(INSTALL) -m 644 tankgun/* $(DESTDIR)${INSTALLDIR}/tankgun |
52 |
- $(INSTALL) -m 644 title/* $(DESTDIR)${INSTALLDIR}/title |
56 |
- $(INSTALL) -m 644 title/* $(DESTDIR)${INSTALLDIR}/title |
53 |
- $(INSTALL) -m 644 text/* $(DESTDIR)${INSTALLDIR}/text |
57 |
- $(INSTALL) -m 644 text/* $(DESTDIR)${INSTALLDIR}/text |
54 |
+ $(INSTALL) -m 444 $(INCOMMON) $(DESTDIR)${INSTALLDIR} |
58 |
+ $(BSD_INSTALL_DATA) -m 644 $(INCOMMON) $(DESTDIR)${INSTALLDIR} |
55 |
+ $(INSTALL) -m 444 button/* $(DESTDIR)${INSTALLDIR}/button |
59 |
+ $(BSD_INSTALL_DATA) -m 644 button/* $(DESTDIR)${INSTALLDIR}/button |
56 |
+ $(INSTALL) -m 444 misc/* $(DESTDIR)${INSTALLDIR}/misc |
60 |
+ $(BSD_INSTALL_DATA) -m 644 misc/* $(DESTDIR)${INSTALLDIR}/misc |
57 |
+ $(INSTALL) -m 444 missile/* $(DESTDIR)${INSTALLDIR}/missile |
61 |
+ $(BSD_INSTALL_DATA) -m 644 missile/* $(DESTDIR)${INSTALLDIR}/missile |
58 |
+ $(INSTALL) -m 444 sound/* $(DESTDIR)${INSTALLDIR}/sound |
62 |
+ $(BSD_INSTALL_DATA) -m 644 sound/* $(DESTDIR)${INSTALLDIR}/sound |
59 |
+ $(INSTALL) -m 444 stock/* $(DESTDIR)${INSTALLDIR}/stock |
63 |
+ $(BSD_INSTALL_DATA) -m 644 stock/* $(DESTDIR)${INSTALLDIR}/stock |
60 |
+ $(INSTALL) -m 444 tank/* $(DESTDIR)${INSTALLDIR}/tank |
64 |
+ $(BSD_INSTALL_DATA) -m 644 tank/* $(DESTDIR)${INSTALLDIR}/tank |
61 |
+ $(INSTALL) -m 444 tankgun/* $(DESTDIR)${INSTALLDIR}/tankgun |
65 |
+ $(BSD_INSTALL_DATA) -m 644 tankgun/* $(DESTDIR)${INSTALLDIR}/tankgun |
62 |
+ $(INSTALL) -m 444 title/* $(DESTDIR)${INSTALLDIR}/title |
66 |
+ $(BSD_INSTALL_DATA) -m 644 title/* $(DESTDIR)${INSTALLDIR}/title |
63 |
+ $(INSTALL) -m 444 text/* $(DESTDIR)${INSTALLDIR}/text |
67 |
+ $(BSD_INSTALL_DATA) -m 644 text/* $(DESTDIR)${INSTALLDIR}/text |
64 |
|
68 |
|
65 |
user: |
69 |
$(TARGET): $(MODULES) |
66 |
INSTALLDIR=./ FLAGS=-DLINUX $(MAKE) -C src |
70 |
$(LD) -o $@ $(MODULES) $(CPPFLAGS) $(LDFLAGS) $(CXXFLAGS) |