LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File qtVlm-fix-makefile.patch of Package qtVlm (Project home:DocB)

diff -Naur a/Makefile b/Makefile
--- a/Makefile	2014-05-08 16:01:42.000000000 -0500
+++ b/Makefile	2014-08-22 21:09:56.621737191 -0500
@@ -2,7 +2,10 @@
 
 TARGET = "release"
 
-prefix = ~/qtVlm
+#prefix = ~/qtVlm
+PREFIX=/usr
+DATADIR=$(PREFIX)/share
+PKG_NAME= qtVlm
 
 ifdef SystemRoot
 	RM = del /Q
@@ -22,7 +25,7 @@
 	CD = cd
 	PWD = $(pwd)
 	SEP = ;	
-	QMAKE = qmake
+	QMAKE = qmake-qt5
 	ifeq ($(shell uname), Linux)
 		RMAPPNAME = $(RM) qtVlm
 		OPTLIB = libgps
@@ -86,14 +89,19 @@
 
 install: all
 	@echo "***********************************************************"
-	@echo "* Installing qtVlm in " $(prefix)
+	@echo "* Installing qtVlm in" $(DATADIR)/$(PKG_NAME)
 	@echo "***********************************************************"
-	mkdir -p $(prefix)
-	cp -Rf qtVlm tr/ $(prefix)
-	cp -Rf base_dir/icon base_dir/img base_dir/polar base_dir/dataColors.dat base_dir/boards plugins $(prefix)
-	mkdir -p $(prefix)/grib
-	mkdir -p $(prefix)/maps
+#	mkdir -p $(prefix)
+	mkdir -p $(DESTDIR)$(DATADIR)/$(PKG_NAME)
+#	cp -Rf qtVlm tr/ $(prefix)
+	cp -Rf qtVlm tr/ $(DESTDIR)$(DATADIR)/$(PKG_NAME)
+#	cp -Rf base_dir/icon base_dir/img base_dir/polar base_dir/dataColors.dat base_dir/boards plugins $(prefix)
+	cp -Rf base_dir/icon base_dir/img base_dir/polar base_dir/dataColors.dat base_dir/boards plugins $(DESTDIR)$(DATADIR)/$(PKG_NAME)
+#	mkdir -p $(prefix)/grib
+	mkdir -p $(DESTDIR)$(DATADIR)/$(PKG_NAME)/grib
+#	mkdir -p $(prefix)/maps
+	mkdir -p $(DESTDIR)$(DATADIR)/$(PKG_NAME)/maps
 	@echo "***********************************************************"
-	@echo "* Install done (" $(prefix) ")"
+	@echo "* Install done (" $(DATADIR)/$(PKG_NAME) ")"
 	@echo "***********************************************************"
 	
diff -Naur a/src/libs/jasper/Makefile b/src/libs/jasper/Makefile
--- a/src/libs/jasper/Makefile	2013-09-25 13:23:22.000000000 -0500
+++ b/src/libs/jasper/Makefile	2014-08-22 15:58:26.771292534 -0500
@@ -17,7 +17,7 @@
 	CD = cd
 	PWD = $(pwd)
 	SEP = ;
-	QMAKE = qmake
+	QMAKE = qmake-qt5
 	ifeq ($(shell uname), Linux)
 		RMAPPNAME = $(RM) qtVlm
 	else
diff -Naur a/src/plugins/Makefile b/src/plugins/Makefile
--- a/src/plugins/Makefile	2014-01-25 10:34:50.000000000 -0600
+++ b/src/plugins/Makefile	2014-08-22 16:36:34.745221514 -0500
@@ -20,7 +20,7 @@
 	CD = cd
 	PWD = $(pwd)
 	SEP = ;	
-	QMAKE = qmake
+	QMAKE = qmake-qt5
 	MKDIR = mkdir
 endif