--- Makefile.orig 2016-11-09 16:27:38 UTC +++ Makefile @@ -1,13 +1,12 @@ -QMAKE=/usr/bin/qmake +QMAKE=/usr/local/lib/qt5/bin/qmake -INSTALLDIR=$(HOME)/zyGrib +INSTALLDIR=$(DESTDIR)$(PREFIX) MACQTBIN=/usr/local/Qt-5.3.2/bin/ -QWTDIR=src/qwt-6.1.3 +#QWTDIR=src/qwt-6.1.3 all: zyGrib -SRC= src/*.h src/*.cpp src/*/*.h src/*/*.cpp \ - src/qwt*/src/*.cpp src/qwt*/src/*.h +SRC= src/*.h src/*.cpp src/*/*.h src/*/*.cpp mac: $(SRC) rm -f ./zyGrib @@ -42,7 +41,6 @@ veryclean: clean zyGrib: $(SRC) @ echo rm -f ./zyGrib - cd $(QWTDIR)/src; $(QMAKE); make -j6 cd src/g2clib; make cd src; $(QMAKE); make -j6 @ echo "-----------------------------------" @@ -54,8 +52,8 @@ zyGrib: $(SRC) install: zyGrib mkdir -p $(INSTALLDIR) mkdir -p $(INSTALLDIR)/bin - cp -a data $(INSTALLDIR) - cp -a grib $(INSTALLDIR) + cp -a data $(INSTALLDIR)/share/zygrib + cp -a grib $(INSTALLDIR)/share/zygrib rm -f ./zyGrib rm -f $(INSTALLDIR)/bin/zyGrib cp -a src/zyGrib $(INSTALLDIR)/bin