diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-25 10:41:30 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-25 10:41:30 +0200 |
| commit | 13318ddbb68d4da204921d7cb31cdd4fecfdc148 (patch) | |
| tree | 0b81475eb1d54f0034c0a61f7f4a388e6d32d30f /package/lm_sensors | |
| parent | 49a10b7779a6e486966641ec25c8098062bfe85b (diff) | |
fixes for make bulkallmod
Diffstat (limited to 'package/lm_sensors')
| -rw-r--r-- | package/lm_sensors/Makefile | 21 | ||||
| -rw-r--r-- | package/lm_sensors/patches/patch-Makefile | 15 |
2 files changed, 26 insertions, 10 deletions
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile index 1c9733e3e..6d37129e7 100644 --- a/package/lm_sensors/Makefile +++ b/package/lm_sensors/Makefile @@ -13,9 +13,10 @@ PKG_SECTION:= misc PKG_URL:= http://www.lm-sensors.org PKG_SITES:= http://dl.lm-sensors.org/lm-sensors/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -TARGET_CFLAGS:= ${TARGET_CFLAGS_ARCH} -fwrapv -fno-ident -PKG_SUBPKGS:= LM_SENSORS LM_SENSORS_DEV LM_SENSORS_DETECT +PKG_ARCH_DEPENDS:= x86 x86_64 + +PKG_SUBPKGS:= LM_SENSORS LM_SENSORS_DEV LM_SENSORS_DETECT PKGSD_LM_SENSORS_DEV:= lm_sensors header files PKGSC_LM_SENSORS_DEV:= devel PKGSD_LM_SENSORS_DETECT:= lm_sensors perl scripts (e.g. sensors-detect) @@ -43,22 +44,22 @@ do-build: lm-sensors-install: ${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/local/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors + ${INSTALL_BIN} ${WRKINST}/usr/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors ${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/lib - ${CP} ${WRKINST}/usr/local/lib/libsensors.so* ${IDIR_LM_SENSORS}/usr/lib + ${CP} ${WRKINST}/usr/lib/libsensors.so* ${IDIR_LM_SENSORS}/usr/lib ${INSTALL_DIR} ${IDIR_LM_SENSORS}/etc ${CP} ${WRKINST}/etc/sensors3.conf ${IDIR_LM_SENSORS}/etc lm-sensors-dev-install: ${INSTALL_DIR} ${IDIR_LM_SENSORS_DEV}/usr/include/sensors - ${CP} ${WRKINST}/usr/local/include/sensors/*.h ${IDIR_LM_SENSORS_DEV}/usr/include/sensors + ${CP} ${WRKINST}/usr/include/sensors/*.h ${IDIR_LM_SENSORS_DEV}/usr/include/sensors lm-sensors-detect-install: ${INSTALL_DIR} ${IDIR_LM_SENSORS_DETECT}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol - ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isadump ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isadump - ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isaset ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isaset - ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/pwmconfig ${IDIR_LM_SENSORS_DETECT}/usr/sbin/pwmconfig - ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/sensors-detect ${IDIR_LM_SENSORS_DETECT}/usr/sbin/sensors-detect + ${INSTALL_BIN} ${WRKINST}/usr/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol + ${INSTALL_BIN} ${WRKINST}/usr/sbin/isadump ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isadump + ${INSTALL_BIN} ${WRKINST}/usr/sbin/isaset ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isaset + ${INSTALL_BIN} ${WRKINST}/usr/sbin/pwmconfig ${IDIR_LM_SENSORS_DETECT}/usr/sbin/pwmconfig + ${INSTALL_BIN} ${WRKINST}/usr/sbin/sensors-detect ${IDIR_LM_SENSORS_DETECT}/usr/sbin/sensors-detect include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lm_sensors/patches/patch-Makefile b/package/lm_sensors/patches/patch-Makefile new file mode 100644 index 000000000..223321ada --- /dev/null +++ b/package/lm_sensors/patches/patch-Makefile @@ -0,0 +1,15 @@ +--- lm_sensors-3.3.1.orig/Makefile 2010-10-26 15:24:12.000000000 +0200 ++++ lm_sensors-3.3.1/Makefile 2011-09-18 19:09:30.217984317 +0200 +@@ -42,10 +42,10 @@ DEBUG := 0 + DESTDIR := + + # This is the prefix that will be used for almost all directories below. +-PREFIX := /usr/local ++PREFIX := /usr + + # Your C compiler +-CC := gcc ++CC ?= gcc + + # This is the directory where sensors3.conf will be installed, if no other + # configuration file is found |