You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
65 lines
2.4 KiB
65 lines
2.4 KiB
4 years ago
|
# HG changeset patch
|
||
|
|
# User 'Michel Alexandre Salim <salimma@fedoraproject.org>'
|
||
|
|
# Date 1605661509 28800
|
||
|
|
# Tue Nov 17 17:05:09 2020 -0800
|
||
|
|
# Node ID a5ac0c9466c59d232d77ac2f82be55a1fb76d1d5
|
||
|
|
# Parent 9df2a19b93a3c4076f2c87cae5022d2b6ae6580e
|
||
|
|
Make INSTALL_LIBDIR configurable
|
||
|
|
|
||
|
|
Some Linux distributions have INSTALL_LIBDIR set to $(PREFIX)/lib64 rather
|
||
|
|
than $(PREFIX)/lib. Allow overriding this; @libdir@ defaults to '${exec_prefix}/lib'
|
||
|
|
so this is a no-op unless overridden.
|
||
|
|
|
||
|
|
Also use `INSTALL_LIBDIR` to configure `INSTALL_VAMPDIR`, `INSTALL_LADSPADIR` and
|
||
|
|
`INSTALL_PKGDIR`
|
||
|
|
|
||
|
|
diff -r 9df2a19b93a3 -r a5ac0c9466c5 Makefile.in
|
||
|
|
--- a/Makefile.in Tue Nov 17 16:48:50 2020 -0800
|
||
|
|
+++ b/Makefile.in Tue Nov 17 17:05:09 2020 -0800
|
||
|
|
@@ -23,11 +23,11 @@
|
||
|
|
|
||
|
|
INSTALL_BINDIR := $(PREFIX)/bin
|
||
|
|
INSTALL_INCDIR := $(PREFIX)/include/rubberband
|
||
|
|
-INSTALL_LIBDIR := $(PREFIX)/lib
|
||
|
|
-INSTALL_VAMPDIR := $(PREFIX)/lib/vamp
|
||
|
|
-INSTALL_LADSPADIR := $(PREFIX)/lib/ladspa
|
||
|
|
+INSTALL_LIBDIR := @libdir@
|
||
|
|
+INSTALL_VAMPDIR := $(INSTALL_LIBDIR)/vamp
|
||
|
|
+INSTALL_LADSPADIR := $(INSTALL_LIBDIR)/ladspa
|
||
|
|
INSTALL_LRDFDIR := $(PREFIX)/share/ladspa/rdf
|
||
|
|
-INSTALL_PKGDIR := $(PREFIX)/lib/pkgconfig
|
||
|
|
+INSTALL_PKGDIR := $(INSTALL_LIBDIR)/pkgconfig
|
||
|
|
|
||
|
|
LIBNAME := librubberband
|
||
|
|
JNINAME := librubberband-jni
|
||
|
|
@@ -196,6 +196,7 @@
|
||
|
|
ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION)
|
||
|
|
test -f $(JNI_TARGET) && cp -fp $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) || true
|
||
|
|
sed "s,%PREFIX%,$(PREFIX)," rubberband.pc.in \
|
||
|
|
+ | sed "s,%LIBDIR%,$(INSTALL_LIBDIR)," \
|
||
|
|
> $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
|
||
|
|
ifeq ($(WITH_PROGRAMS), yes)
|
||
|
|
$(MKDIR) -p $(DESTDIR)$(INSTALL_BINDIR)
|
||
|
|
diff -r 9df2a19b93a3 -r a5ac0c9466c5 Makefile.osx
|
||
|
|
--- a/Makefile.osx Tue Nov 17 16:48:50 2020 -0800
|
||
|
|
+++ b/Makefile.osx Tue Nov 17 17:05:09 2020 -0800
|
||
|
|
@@ -177,6 +177,7 @@
|
||
|
|
cp ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
|
||
|
|
cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
|
||
|
|
sed "s,%PREFIX%,$(PREFIX)," rubberband.pc.in \
|
||
|
|
+ | sed "s,%LIBDIR%,$(INSTALL_LIBDIR)," \
|
||
|
|
> $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
|
||
|
|
|
||
|
|
clean:
|
||
|
|
diff -r 9df2a19b93a3 -r a5ac0c9466c5 rubberband.pc.in
|
||
|
|
--- a/rubberband.pc.in Tue Nov 17 16:48:50 2020 -0800
|
||
|
|
+++ b/rubberband.pc.in Tue Nov 17 17:05:09 2020 -0800
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
prefix=%PREFIX%
|
||
|
|
exec_prefix=${prefix}
|
||
|
|
-libdir=${exec_prefix}/lib
|
||
|
|
+libdir=%LIBDIR%
|
||
|
|
includedir=${prefix}/include
|
||
|
|
|
||
|
|
Name: rubberband
|