--- Makefile.orig 2018-02-06 16:36:07 UTC +++ Makefile @@ -1,13 +1,13 @@ APPNAME = FreeFileSync -prefix = /usr +prefix = $(PREFIX) BINDIR = $(DESTDIR)$(prefix)/bin SHAREDIR = $(DESTDIR)$(prefix)/share APPSHAREDIR = $(SHAREDIR)/$(APPNAME) DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME) -CXXFLAGS = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -Wall -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread +CXXFLAGS = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -Wall -O3 -DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -pthread -LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread +LINKFLAGS = -s `${WX_CONFIG} --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread #Gtk - support recycler/icon loading/no button border/grid scrolling CXXFLAGS += `pkg-config --cflags gtk+-2.0` @@ -99,10 +99,10 @@ launchpad: FreeFileSync ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp mkdir -p $(dir $@) - g++ $(CXXFLAGS) -c $< -o $@ + ${CXX} $(CXXFLAGS) -c $< -o $@ FreeFileSync: $(OBJECT_LIST) - g++ -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) + ${CXX} -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) clean: rm -rf ../Obj/FFS_GCC_Make_Release @@ -111,7 +111,7 @@ clean: install: mkdir -p $(BINDIR) - cp ../Build/$(APPNAME) $(BINDIR) + cp ../Build/$(APPNAME) $(BINDIR)/freefilesync mkdir -p $(APPSHAREDIR) cp -R ../Build/Languages/ \ @@ -122,6 +122,3 @@ install: ../Build/Resources.zip \ $(APPSHAREDIR) - mkdir -p $(DOCSHAREDIR) - cp ../Build/Changelog.txt $(DOCSHAREDIR)/changelog - gzip $(DOCSHAREDIR)/changelog