Commit 75e4f8ee authored by Franco Fichtner's avatar Franco Fichtner

make: tweak previous

parent 571bc8c9
...@@ -242,13 +242,11 @@ package-check: force ...@@ -242,13 +242,11 @@ package-check: force
fi fi
package: package-check package: package-check
@rm -rf ${WRKSRC} ${PKGDIR} @rm -rf ${WRKSRC}
@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} metadata @${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} metadata
@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install @${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install
@PORTSDIR=${.CURDIR} ${PKG} create -v -m ${WRKSRC} -r ${WRKSRC} \ @PORTSDIR=${.CURDIR} ${PKG} create -v -m ${WRKSRC} -r ${WRKSRC} \
-p ${WRKSRC}/plist -o ${PKGDIR} -p ${WRKSRC}/plist -o ${PKGDIR}
@echo -n "Successfully built "
@cd ${PKGDIR}; find . -name "*.txz" | cut -c3-
upgrade-check: force upgrade-check: force
@if ! ${PKG} info ${CORE_NAME} > /dev/null; then \ @if ! ${PKG} info ${CORE_NAME} > /dev/null; then \
...@@ -257,6 +255,7 @@ upgrade-check: force ...@@ -257,6 +255,7 @@ upgrade-check: force
fi fi
upgrade: upgrade-check package upgrade: upgrade-check package
@rm -rf ${PKGDIR}
@${PKG} delete -fy ${CORE_NAME} @${PKG} delete -fy ${CORE_NAME}
@${PKG} add ${PKGDIR}/*.txz @${PKG} add ${PKGDIR}/*.txz
@/usr/local/etc/rc.restart_webgui @/usr/local/etc/rc.restart_webgui
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment