diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /package/watchdog/Makefile | |
| parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) | |
resolve conflicts
Diffstat (limited to 'package/watchdog/Makefile')
| -rw-r--r-- | package/watchdog/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index b2c4839f7..ab8f5c570 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -18,7 +18,7 @@ $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ post-install: ${INSTALL_DIR} ${IDIR_WATCHDOG}/sbin ${IDIR_WATCHDOG}/etc/ ${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/ - ${INSTALL_BIN} ${WRKINST}/sbin/watchdog \ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \ ${IDIR_WATCHDOG}/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk |