Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-24 09:31:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'chrko-makefile_fixes' into stable

Browse Source
This commit is contained in:
Fred Gleason
2018-05-25 20:01:14 +00:00
parent 005ddc5237 555e59b28d
commit 6983840cc9
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@@ -100,13 +100,8 @@ fi
AR_GCC_TARGET() AR_GCC_TARGET()
AC_SUBST(VENDOR,$ar_gcc_distro) AC_SUBST(VENDOR,$ar_gcc_distro)
AC_SUBST(ARCH,$ar_gcc_arch) AC_SUBST(ARCH,$ar_gcc_arch)
if test $ar_gcc_arch = x86_64 ; then LIB_PATH=$PREFIX/lib
LIB_PATH=$PREFIX/lib64 AC_SUBST(RD_LIB_PATH,lib)
AC_SUBST(RD_LIB_PATH,lib64)
else
LIB_PATH=$PREFIX/lib
AC_SUBST(RD_LIB_PATH,lib)
fi
# #
# Determine Distro # Determine Distro

3
pam_rd/Makefile.am
View File

@@ -29,8 +29,9 @@ MOC = @QT_MOC@
moc_%.cpp: %.h moc_%.cpp: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@
inst_prefix_dir=$(DESTDIR)
inst_lib_LTLIBRARIES = pam_rd.la inst_lib_LTLIBRARIES = pam_rd.la
inst_libdir=/@RD_LIB_PATH@/security inst_libdir=$(prefix)/@RD_LIB_PATH@/security
dist_pam_rd_la_SOURCES = pam_rd.cpp dist_pam_rd_la_SOURCES = pam_rd.cpp
pam_rd_la_LDFLAGS = -module -shared -Xlinker -x -avoid-version -export-dynamic pam_rd_la_LDFLAGS = -module -shared -Xlinker -x -avoid-version -export-dynamic
pam_rd_la_LIBADD = @LIB_RDLIBS@ -lpam @LIBVORBIS@ pam_rd_la_LIBADD = @LIB_RDLIBS@ -lpam @LIBVORBIS@

4
rdcartslots/Makefile.am
View File

@@ -37,8 +37,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcartslots_*.qm rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcartslots_*.qm
all: all:
lupdate rdcartslots.pro @QT_BIN@/lupdate rdcartslots.pro
lrelease rdcartslots.pro @QT_BIN@/lrelease rdcartslots.pro
bin_PROGRAMS = rdcartslots bin_PROGRAMS = rdcartslots

2
rdselect/Makefile.am
View File

@@ -29,7 +29,7 @@ moc_%.cpp: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@
# I18N Stuff # I18N Stuff
install-exec-local: install-exec-hook:
mkdir -p $(DESTDIR)$(prefix)/share/rivendell mkdir -p $(DESTDIR)$(prefix)/share/rivendell
cp rdselect_*.qm $(DESTDIR)$(prefix)/share/rivendell cp rdselect_*.qm $(DESTDIR)$(prefix)/share/rivendell
chmod 4755 $(DESTDIR)$(prefix)/bin/rdselect chmod 4755 $(DESTDIR)$(prefix)/bin/rdselect