Fix compilation and installation under FreeBSD -- changes to allow building in a separate directory broke the FreeBSD build process.
This commit is contained in:
+16
-16
@@ -140,12 +140,10 @@ shairport_sync_LDADD += lib_pair_ap.a
|
||||
lib_pair_ap_a_SOURCES = pair_ap/pair.c pair_ap/pair_fruit.c pair_ap/pair_homekit.c pair_ap/pair-tlv.c
|
||||
noinst_LIBRARIES += lib_pair_ap.a
|
||||
plist_xml_strings.h: plists/get_info_response.xml
|
||||
echo "// Do not edit!" > plist_xml_strings.h
|
||||
echo "// This file is automatically generated from files in the plists folder." >> plist_xml_strings.h
|
||||
echo "" >> plist_xml_strings.h
|
||||
xxd -i $< >> plist_xml_strings.h
|
||||
echo "" >> plist_xml_strings.h
|
||||
sed -e 's/[^ ]*plists_get_info_response_xml/plists_get_info_response_xml/g' -i plist_xml_strings.h
|
||||
printf "// Do not edit!\n" > plist_xml_strings.h
|
||||
printf "// This file is automatically generated from files in the plists folder.\n\n" >> plist_xml_strings.h
|
||||
xxd -i $(top_srcdir)/plists/get_info_response.xml - | sed -e 's/[^ ]*plists_get_info_response_xml/plists_get_info_response_xml/g' >> plist_xml_strings.h
|
||||
printf "\n" >> plist_xml_strings.h
|
||||
plist_xml_strings.c: plist_xml_strings.h
|
||||
touch plist_xml_strings.c
|
||||
|
||||
@@ -166,8 +164,10 @@ noinst_HEADERS += $(BUILT_SOURCES)
|
||||
# Correctly clean the generated headers, but keep the xml description
|
||||
CLEANFILES += $(BUILT_SOURCES)
|
||||
|
||||
|
||||
|
||||
dbus-interface.c: org.gnome.ShairportSync.xml
|
||||
gdbus-codegen --interface-prefix org.gnome --generate-c-code dbus-interface $<
|
||||
gdbus-codegen --interface-prefix org.gnome --generate-c-code dbus-interface $(top_srcdir)/org.gnome.ShairportSync.xml
|
||||
dbus-interface.h: dbus-interface.c
|
||||
touch dbus-interface.h
|
||||
endif
|
||||
@@ -184,7 +184,7 @@ noinst_HEADERS += $(BUILT_SOURCES)
|
||||
CLEANFILES += $(BUILT_SOURCES)
|
||||
|
||||
mpris-interface.c: org.mpris.MediaPlayer2.xml
|
||||
gdbus-codegen --interface-prefix org.mpris --generate-c-code mpris-interface $<
|
||||
gdbus-codegen --interface-prefix org.mpris --generate-c-code mpris-interface $(top_srcdir)/org.mpris.MediaPlayer2.xml
|
||||
mpris-interface.h: mpris-interface.c
|
||||
touch mpris-interface.h
|
||||
endif
|
||||
@@ -210,8 +210,8 @@ if INSTALL_CONFIG_FILES
|
||||
CONFIG_FILE_INSTALL_TARGET = config-file-install-local
|
||||
$(CONFIG_FILE_INSTALL_TARGET): scripts/shairport-sync.conf
|
||||
install -d $(DESTDIR)$(sysconfdir)
|
||||
install -m 0644 $< $(DESTDIR)$(sysconfdir)/shairport-sync.conf.sample
|
||||
[ -f $(DESTDIR)$(sysconfdir)/shairport-sync.conf ] || cp $< $(DESTDIR)$(sysconfdir)/shairport-sync.conf
|
||||
install -m 0644 $(top_srcdir)/scripts/shairport-sync.conf $(DESTDIR)$(sysconfdir)/shairport-sync.conf.sample
|
||||
[ -f $(DESTDIR)$(sysconfdir)/shairport-sync.conf ] || cp scripts/shairport-sync.conf $(DESTDIR)$(sysconfdir)/shairport-sync.conf
|
||||
|
||||
if BUILD_FOR_LINUX
|
||||
DBUS_POLICY_DIR = /etc/dbus-1/system.d
|
||||
@@ -231,7 +231,7 @@ DBUS_POLICY_INSTALL_TARGET = dbus-policy-install-local
|
||||
|
||||
$(DBUS_POLICY_INSTALL_TARGET): $(DBUS_POLICY_FILE)
|
||||
install -d $(DESTDIR)$(DBUS_POLICY_DIR)
|
||||
install -m 0644 $< $(DESTDIR)$(DBUS_POLICY_DIR)/shairport-sync-dbus.conf
|
||||
install -m 0644 $(top_srcdir)/$(DBUS_POLICY_FILE) $(DESTDIR)$(DBUS_POLICY_DIR)/shairport-sync-dbus.conf
|
||||
|
||||
endif # USE_DBUS
|
||||
|
||||
@@ -247,7 +247,7 @@ MPRIS_POLICY_INSTALL_TARGET = mpris-policy-install-local
|
||||
|
||||
$(MPRIS_POLICY_INSTALL_TARGET): $(MPRIS_POLICY_FILE)
|
||||
install -d $(DESTDIR)$(DBUS_POLICY_DIR)
|
||||
install -m 0644 $< $(DESTDIR)$(DBUS_POLICY_DIR)/shairport-sync-mpris.conf
|
||||
install -m 0644 $(top_srcdir)/$(MPRIS_POLICY_FILE) $(DESTDIR)$(DBUS_POLICY_DIR)/shairport-sync-mpris.conf
|
||||
|
||||
endif # USE_MPRIS
|
||||
|
||||
@@ -269,7 +269,7 @@ INSTALL_SYSTEMV_TARGET = install-systemv-local
|
||||
|
||||
$(INSTALL_SYSTEMV_TARGET): scripts/shairport-sync $(INSTALL_USER_TARGET)
|
||||
install -d $(DESTDIR)$(sysconfdir)/init.d
|
||||
[ -e $(DESTDIR)$(sysconfdir)/init.d/shairport-sync ] || install -m 0644 $< $(DESTDIR)$(sysconfdir)/init.d
|
||||
[ -e $(DESTDIR)$(sysconfdir)/init.d/shairport-sync ] || install -m 0644 $(top_srcdir)/scripts/shairport-sync $(DESTDIR)$(sysconfdir)/init.d
|
||||
|
||||
endif # INSTALL_SYSTEMV
|
||||
|
||||
@@ -285,7 +285,7 @@ INSTALL_SYSTEMD_TARGET = install-systemd-local
|
||||
|
||||
$(INSTALL_SYSTEMD_TARGET): scripts/$(SYSTEMD_SERVICE) $(INSTALL_USER_TARGET)
|
||||
install -d $(DESTDIR)$(systemdsystemunitdir)
|
||||
[ -e $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service ] || install -m 0644 $< $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service
|
||||
[ -e $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service ] || install -m 0644 $(top_srcdir)/cripts/$(SYSTEMD_SERVICE) $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service
|
||||
|
||||
endif # INSTALL_SYSTEMD
|
||||
|
||||
@@ -301,7 +301,7 @@ INSTALL_FREEBSD_TARGET = install-freebsd-local
|
||||
$(INSTALL_FREEBSD_TARGET): scripts/shairport-sync.freebsd install-freebsd-user-local
|
||||
install -d -o shairport-sync -g shairport-sync $(DESTDIR)/var/run/shairport-sync
|
||||
install -d $(DESTDIR)/usr/local/etc/rc.d/
|
||||
install -m 0555 $< $(DESTDIR)/usr/local/etc/rc.d/shairport_sync
|
||||
install -m 0555 $(top_srcdir)/scripts/shairport-sync.freebsd $(DESTDIR)/usr/local/etc/rc.d/shairport_sync
|
||||
|
||||
endif # INSTALL_FREEBSD_SERVICE
|
||||
|
||||
@@ -311,7 +311,7 @@ INSTALL_CYGWIN_TARGET = install-cygwin-local
|
||||
|
||||
$(INSTALL_CYGWIN_TARGET): scripts/shairport-sync-config
|
||||
install -d $(DESTDIR)/usr/local/bin
|
||||
[ -e $(DESTDIR)/usr/local/bin/shairport-sync-config ] || install -m 0755 $< $(DESTDIR)/usr/local/bin/
|
||||
[ -e $(DESTDIR)/usr/local/bin/shairport-sync-config ] || install -m 0755 $(top_srcdir)/scripts/shairport-sync-config $(DESTDIR)/usr/local/bin/
|
||||
|
||||
endif # INSTALL_CYGWIN_SERVICE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user