aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2010-01-23 20:38:27 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2010-01-24 10:17:25 +0100
commit73f8d82f6a94c1179a7a7a60a1d5988194e4c166 (patch)
tree1e192d4f5072f7298440b5901a59307b00259a31
parent9395d15e37617631d32727f4537548e6e22aa687 (diff)
downloadcpufrequtils-73f8d82f6a94c1179a7a7a60a1d5988194e4c166.tar.gz
install library preserving symbolic links
Use cp to preserve symlinks in install target. Fix dependencies for native language support. I changed the variable name in the previos commit and forget to change it here. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index af5e94c..b0c4971 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,7 @@ confdir ?= /etc/
# Toolchain: what tools do we use, and what options do they need:
+CP = cp -fpR
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -193,16 +194,16 @@ libcpufreq.so.$(LIB_MAJ): $(LIB_OBJS)
libcpufreq: libcpufreq.so.$(LIB_MAJ)
-cpufreq-%: libcpufreq.so.$(LIB_MAJ) $(UTIL_OBJS)
+cpufreq-%: libcpufreq.so.$(LIB_MAJ) $(UTIL_SRC)
$(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I./lib/ -c -o utils/$@.o utils/$*.c
$(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/$@.o -lcpufreq
$(QUIET) $(STRIPCMD) $@
utils: cpufreq-info cpufreq-set cpufreq-aperf
-po/$(PACKAGE).pot: $(UTIL_OBJS)
+po/$(PACKAGE).pot: $(UTIL_SRC)
@xgettext --default-domain=$(PACKAGE) --add-comments \
- --keyword=_ --keyword=N_ $(UTIL_OBJS) && \
+ --keyword=_ --keyword=N_ $(UTIL_SRC) && \
test -f $(PACKAGE).po && \
mv -f $(PACKAGE).po po/$(PACKAGE).pot
@@ -234,7 +235,7 @@ clean:
install-lib:
$(INSTALL) -d $(DESTDIR)${libdir}
- $(INSTALL) libcpufreq.so* $(DESTDIR)${libdir}/
+ $(CP) libcpufreq.so* $(DESTDIR)${libdir}/
$(INSTALL) -d $(DESTDIR)${includedir}
$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h
@@ -259,7 +260,7 @@ install-bench:
@#DESTDIR must be set from outside to survive
@sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) $(MAKE) -C bench install
-install: install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH)
+install: all install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH)
uninstall:
- rm -f $(DESTDIR)${libdir}/libcpufreq.*