aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Dongili <malattia@linux.it>2006-04-19 19:51:51 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2006-05-30 17:38:00 +0200
commitad6930ea2eff2e440ae2531febfeaa16404f21a9 (patch)
tree2edc032a749286379b90c16c01e704651d3de4dd
parent46547d3f409e2c43b79c0dc5bb61997c350dbe1f (diff)
downloadcpufrequtils-ad6930ea2eff2e440ae2531febfeaa16404f21a9.tar.gz
[PATCH] Makefile: sanitize rpath and quieten the strip command
- Use ccdv to run strip (yes, a really cosmetic change) - Use the proper rpath when linking libcpufreq.so. It is needed because otherwise libtool will create a messed libdir in libcpufreq.la fooling 3rd parties linking against libcpufreq (and using libtool for themselves). Since the problem is the usage of $(DESTDIR) this will probably only show in prebuilt packages in linux distros. Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0ebffd8..8b34193 100644
--- a/Makefile
+++ b/Makefile
@@ -185,14 +185,14 @@ libcpufreq.la: $(LIB_OBJS) $(LIB_HEADERS) $(LIB_PARTS) Makefile
exit -1; \
fi;
$(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=link $(CC) $(CFLAGDEF) $(CFLAGS) $(LDFLAGS) -o libcpufreq.la -rpath \
- $(DESTDIR)${libdir} -version-info $(LIB_VERSION) $(LIB_PARTS)
+ ${libdir} -version-info $(LIB_VERSION) $(LIB_PARTS)
libcpufreq: libcpufreq.la
cpufreq-%: $(UTIL_OBJS)
$(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I. -I./lib/ -c -o utils/$@.o utils/$*.c
$(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I./lib/ -L. -L./.libs/ -lcpufreq -o $@ utils/$@.o
- $(STRIPCMD) $@
+ $(QUIET) $(STRIPCMD) $@
utils: cpufreq-info cpufreq-set