Resolve conflicts

1 files changed, 18 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index a641681..9aab5c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,27 @@
-INSTALLDIR=/usr/local
-DESTDIR=${INSTALLDIR}/genwebsite
-JAR=${DESTDIR}/genwebsite.jar
-LAUNCHER=genwebsite
-BUILDDIR=target
+APPNAME=hyde
+INSTALLDIR=~
+DESTDIR=${INSTALLDIR}/.${APPNAME}
+JAR=${DESTDIR}/${APPNAME}.jar
+LAUNCHER=${APPNAME}
 
 dist:
 	mvn package
-	cp genwebsite.sh.mk ${BUILDDIR}/${LAUNCHER}.sh
-	chmod +x ${BUILDDIR}/${LAUNCHER}.sh
-	sed -i "" "s|DESTDIR|${JAR}|" ${BUILDDIR}/${LAUNCHER}.sh
+
+env:
+	@echo "APPNAME    = "${APPNAME}
+	@echo "INSTALLDIR = "${INSTALLDIR}
+	@echo "DESTDIR    = "${DESTDIR}
+	@echo "JAR        = "${JAR}
+	@echo "LAUNCHER   = "${LAUNCHER}
 
 install:
 	mkdir -p ${DESTDIR}
-	cp target/genwebsite-*-jar-with-dependencies.jar ${JAR}
-	cp ${BUILDDIR}/${LAUNCHER}.sh ${DESTDIR}
-	ln -s -f ${DESTDIR}/${LAUNCHER}.sh ${INSTALLDIR}/bin/${LAUNCHER}
+	cp target/${APPNAME}-*-jar-with-dependencies.jar ${JAR}
+	cp ${APPNAME}.sh.mk ${LAUNCHER}.sh
+	chmod +x ${LAUNCHER}.sh
+	sed -i "" "s|DESTDIR|${JAR}|" ${LAUNCHER}.sh
+	cp ${APPNAME}.sh ${DESTDIR}
+	ln -s ${DESTDIR}/${LAUNCHER}.sh ${INSTALLDIR}/bin/${LAUNCHER}
 
 clean:
 	rm -rf ${BUILDDIR}