Lines 1-5
Link Here
|
1 |
--- Makefile.orig 2009-10-29 14:38:40.000000000 +0600 |
1 |
--- Makefile.orig 2009-10-29 14:38:40.000000000 +0600 |
2 |
+++ Makefile 2010-01-04 19:55:10.000000000 +0600 |
2 |
+++ Makefile 2014-02-09 13:29:16.000000000 +0700 |
3 |
@@ -6,7 +6,7 @@ |
3 |
@@ -6,7 +6,7 @@ |
4 |
|
4 |
|
5 |
# replace CFLAGS and LFLAGS -O (oh) with -g for GDB debugging |
5 |
# replace CFLAGS and LFLAGS -O (oh) with -g for GDB debugging |
Lines 9-14
Link Here
|
9 |
|
9 |
|
10 |
# use $PREFIX if defined, else assume /usr/local |
10 |
# use $PREFIX if defined, else assume /usr/local |
11 |
ifeq "$(PREFIX)" "" |
11 |
ifeq "$(PREFIX)" "" |
|
|
12 |
@@ -19,14 +19,14 @@ |
13 |
DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop |
14 |
|
15 |
$(PROGRAM): $(PROGRAM).o zfuncs.o |
16 |
- @ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o |
17 |
+ @ ${CXX} $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o |
18 |
|
19 |
$(PROGRAM).o: $(SOURCE) zfuncs.h |
20 |
- @ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
21 |
+ @ ${CXX} $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
22 |
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" |
23 |
|
24 |
zfuncs.o: zfuncs.cpp zfuncs.h |
25 |
- @ g++ $(CFLAGS) zfuncs.cpp \ |
26 |
+ @ ${CXX} $(CFLAGS) zfuncs.cpp \ |
27 |
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" |
28 |
|
29 |
install: $(PROGRAM) |
12 |
@@ -39,15 +39,16 @@ |
30 |
@@ -39,15 +39,16 @@ |
13 |
cp $(PROGRAM) $(DESTDIR)$(BINDIR) |
31 |
cp $(PROGRAM) $(DESTDIR)$(BINDIR) |
14 |
cp -R locales/* $(DESTDIR)$(DATADIR)/locales |
32 |
cp -R locales/* $(DESTDIR)$(DATADIR)/locales |