1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-30 07:39:42 +02:00

Corrext handling of builds where the name of the Audacity binary is not "audacity", via the --program-prefix and --program-suffix options to configure.

Also make numerous other fixes to make uninstall which distros never seem to patch when they patch make install - we now uninstall all the files we install during make install.
This commit is contained in:
richardash1981 2010-04-24 11:24:08 +00:00
parent b2b82d4ea0
commit fce76e9f46
4 changed files with 50 additions and 17 deletions

View File

@ -31,7 +31,6 @@ install: audacity $(EXTRAINSTALLTARGETS)
$(INSTALL) -m 755 audacity $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME)
# install docs
$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)
$(INSTALL) -d $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
$(INSTALL) -m 644 README.txt $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/README.txt
$(INSTALL) -m 644 LICENSE.txt $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/LICENSE.txt
@ -53,31 +52,33 @@ install: audacity $(EXTRAINSTALLTARGETS)
# install locales
$(MAKE) -C locale install
# install an icon for audacity
# install icons for audacity
$(INSTALL) -d $(DESTDIR)$(DATADIR)/pixmaps/
$(INSTALL) -m 644 images/AudacityLogo48x48.xpm $(DESTDIR)$(DATADIR)/pixmaps/audacity.xpm
$(INSTALL) -m 644 images/AudacityLogo48x48.xpm $(DESTDIR)$(DATADIR)/pixmaps/$(AUDACITY_NAME).xpm
$(INSTALL) -d $(DESTDIR)$(DATADIR)/icons/hicolor/16x16/apps
$(INSTALL) -m 644 images/audacity16.png $(DESTDIR)$(DATADIR)/icons/hicolor/16x16/apps/audacity.png
$(INSTALL) -m 644 images/audacity16.png $(DESTDIR)$(DATADIR)/icons/hicolor/16x16/apps/$(AUDACITY_NAME).png
$(INSTALL) -d $(DESTDIR)$(DATADIR)/icons/hicolor/22x22/apps
$(INSTALL) -m 644 images/audacity22.png $(DESTDIR)$(DATADIR)/icons/hicolor/22x22/apps/audacity.png
$(INSTALL) -m 644 images/audacity22.png $(DESTDIR)$(DATADIR)/icons/hicolor/22x22/apps/$(AUDACITY_NAME).png
$(INSTALL) -d $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps
$(INSTALL) -m 644 images/audacity24.png $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps/audacity.png
$(INSTALL) -m 644 images/audacity24.png $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps/$(AUDACITY_NAME).png
$(INSTALL) -d $(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps
$(INSTALL) -m 644 images/audacity32.png $(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps/audacity.png
$(INSTALL) -m 644 images/audacity32.png $(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps/$(AUDACITY_NAME).png
$(INSTALL) -d $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
$(INSTALL) -m 644 images/audacity48.png $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps/audacity.png
$(INSTALL) -m 644 images/audacity48.png $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps/$(AUDACITY_NAME).png
$(INSTALL) -d $(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps
$(INSTALL) -m 644 images/audacity.svg $(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/audacity.svg
$(INSTALL) -m 644 images/audacity.svg $(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/$(AUDACITY_NAME).svg
$(INSTALL) -d $(DESTDIR)$(DATADIR)/pixmaps
$(INSTALL) -m 644 images/audacity16.xpm $(DESTDIR)$(DATADIR)/pixmaps/audacity16.xpm
$(INSTALL) -m 644 images/audacity32.xpm $(DESTDIR)$(DATADIR)/pixmaps/audacity32.xpm
$(INSTALL) -m 644 images/audacity16.xpm $(DESTDIR)$(DATADIR)/pixmaps/$(AUDACITY_NAME)16.xpm
$(INSTALL) -m 644 images/audacity32.xpm $(DESTDIR)$(DATADIR)/pixmaps/$(AUDACITY_NAME)32.xpm
# note we don't use the AUDACITY_NAME variable here, because the mime type
# doesn't depend on it
$(INSTALL) -m 644 images/gnome-mime-application-x-audacity-project.xpm $(DESTDIR)$(DATADIR)/pixmaps/gnome-mime-application-x-audacity-project.xpm
.PHONY: install-extra-data
install-extra-data:
# install desktop file
$(INSTALL) -d $(DESTDIR)$(DATADIR)/applications
$(INSTALL) -m 644 src/audacity.desktop $(DESTDIR)$(DATADIR)/applications
$(INSTALL) -m 644 src/audacity.desktop $(DESTDIR)$(DATADIR)/applications/$(AUDACITY_NAME).desktop
# install MIME information
$(INSTALL) -d $(DESTDIR)$(DATADIR)/mime/packages
@ -91,16 +92,35 @@ install-lrdf-data:
.PHONY: uninstall
uninstall: $(EXTRAUNINSTALLTARGETS)
# remove binary
rm -rf $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME)
# remove docs
rm -rf $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)
# remove man page
rm -rf $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/audacity.xpm
# remove nyquist
rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
# remove plug-ins
rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
# remove locales
$(MAKE) -C locale uninstall
# remove icons
rm -rf $(DESTDIR)$(DATADIR)/pixmaps/$(AUDACITY_NAME).xpm
rm -rf $(DESTDIR)$(DATADIR)/icons/hicolor/16x16/apps/$(AUDACITY_NAME).png
rm -rf $(DESTDIR)$(DATADIR)/icons/hicolor/22x22/apps/$(AUDACITY_NAME).png
rm -rf $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps/$(AUDACITY_NAME).png
rm -rf $(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps/$(AUDACITY_NAME).png
rm -rf $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps/$(AUDACITY_NAME).png
rm -rf $(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/$(AUDACITY_NAME).svg
rm -rf $(DESTDIR)$(DATADIR)/pixmaps/$(AUDACITY_NAME)16.xpm
rm -rf $(DESTDIR)$(DATADIR)/pixmaps/$(AUDACITY_NAME)32.xpm
# and the mime type icon
rm -rf $(DESTDIR)$(DATADIR)/pixmaps/gnome-mime-application-x-audacity-project.xpm
.PHONY: uninstall-extra-data
uninstall-extra-data:
rm -f $(DESTDIR)$(DATADIR)/applications/audacity.desktop
rm -f $(DESTDIR)$(DATADIR)/applications/$(AUDACITY_NAME).desktop
rm -f $(DESTDIR)$(DATADIR)/mime/packages/audacity.xml
.PHONY: uninstall-lrdf-data
@ -127,6 +147,7 @@ clean:
rm -f audacity
rm -f help/audacity.1.gz
rm -rf Audacity.app
rm -r src/audacity.desktop
veryclean: clean
rm -f Makefile src/Makefile lib-src/Makefile

7
configure vendored
View File

@ -9831,8 +9831,14 @@ case "${host_os}" in
;;
esac
# process Makefile.in's to generate Makefiles
ac_config_files="$ac_config_files Makefile src/Makefile lib-src/Makefile locale/Makefile"
# Anything that depends on the name of the installed Audacity binary needs
# to be processed to set that here
ac_config_files="$ac_config_files src/audacity.desktop"
if [ "x$LIBEXPAT_USE_LOCAL" = "xyes" ]; then
ac_config_files="$ac_config_files lib-src/expat/Makefile"
@ -10442,6 +10448,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"lib-src/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;;
"locale/Makefile") CONFIG_FILES="$CONFIG_FILES locale/Makefile" ;;
"src/audacity.desktop") CONFIG_FILES="$CONFIG_FILES src/audacity.desktop" ;;
"lib-src/expat/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/expat/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;

View File

@ -654,8 +654,13 @@ case "${host_os}" in
;;
esac
# process Makefile.in's to generate Makefiles
AC_CONFIG_FILES([Makefile src/Makefile lib-src/Makefile \
locale/Makefile])
# Anything that depends on the name of the installed Audacity binary needs
# to be processed to set that here
AC_CONFIG_FILES([src/audacity.desktop])
dnl There are various other files we might need to process, depends on what
dnl has been enabled previously
if [[ "x$LIBEXPAT_USE_LOCAL" = "xyes" ]]; then

View File

@ -9,12 +9,12 @@ Comment=Record and edit audio files
Comment[de]=Audio-Dateien aufnehmen und bearbeiten
Comment[ru]=Запись и редактирование звуковых файлов
Icon=audacity
Icon=@AUDACITY_NAME@
Type=Application
Categories=AudioVideo;Audio;AudioVideoEditing;
Exec=audacity
Exec=@AUDACITY_NAME@
StartupNotify=false
Terminal=false
MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;