notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Installation tweaks to Makefile

Browse source 
* Install Tux Paint docs into a version-numbered directory
   (e.g., "/usr/local/share/doc/tuxpaint-0.9.23/")

 * Launcher icon installation location adjustments:
   * .../X11R6/include/X11/pixmaps/ -> .../share/pixmaps/
   * Using kde4config (vs kdeconfig); not putting things in "Graphics" subdir.
   * Removed gnome-config stuff
This commit is contained in:
Bill Kendrick 2018-08-19 21:31:09 -07:00
parent 5e88f0473b
commit edae5fc771
4 changed files with 111 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Makefile
View file

@ -164,12 +164,11 @@ LIBDIR=$(PREFIX)
# Magic Tool plug-ins # Magic Tool plug-ins
INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib/tuxpaint/plugins MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
# Docs and man page: # Docs and man page:
DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-dev DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
@ -189,10 +188,10 @@ endif
# Icons and launchers: # Icons and launchers:
ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null) KDE_PREFIX:=$(shell kde-config --install xdgdata-apps --expandvars 2> /dev/null)
KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null) KDE_ICON_PREFIX:=$(shell kde4-config --install icon --expandvars 2> /dev/null)
# Maemo flag # Maemo flag
MAEMOFLAG:= MAEMOFLAG:=
@ -464,7 +463,7 @@ trans:
windows_ARCH_INSTALL:= windows_ARCH_INSTALL:=
osx_ARCH_INSTALL:=install-macbundle TuxPaint.dmg osx_ARCH_INSTALL:=install-macbundle TuxPaint.dmg
beos_ARCH_INSTALL:=install-haiku beos_ARCH_INSTALL:=install-haiku
linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons linux_ARCH_INSTALL:=install-kde install-kde-icons
ARCH_INSTALL:=$($(OS)_ARCH_INSTALL) ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
# "make install" installs all of the various parts # "make install" installs all of the various parts
@ -604,15 +603,10 @@ clean:
# are the same as they were when you installed, of course!!! # are the same as they were when you installed, of course!!!
.PHONY: uninstall .PHONY: uninstall
uninstall: uninstall-i18n uninstall: uninstall-i18n
-if [ "x$(GNOME_PREFIX)" != "x" ]; then \ -rm /usr/share/applications/tuxpaint.desktop; \
rm $(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \ -rm /usr/share/pixmaps/tuxpaint.png; \
rm $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
else \
rm /usr/share/applications/tuxpaint.desktop; \
rm /usr/share/pixmaps/tuxpaint.png; \
fi
-if [ "x$(KDE_PREFIX)" != "x" ]; then \ -if [ "x$(KDE_PREFIX)" != "x" ]; then \
rm $(KDE_PREFIX)/Graphics/tuxpaint.desktop; \ rm $(KDE_PREFIX)/tuxpaint.desktop; \
fi fi
-rm $(ICON_PREFIX)/tuxpaint.png -rm $(ICON_PREFIX)/tuxpaint.png
-rm $(X11_ICON_PREFIX)/tuxpaint.xpm -rm $(X11_ICON_PREFIX)/tuxpaint.xpm
@ -757,21 +751,6 @@ echo-install-example-templates:
install-example-templates: echo-install-example-templates install-example-template-dirs $(INSTALLED_TEMPLATES) install-example-templates: echo-install-example-templates install-example-template-dirs $(INSTALLED_TEMPLATES)
# Install a launcher icon in the Gnome menu
.PHONY: install-gnome
install-gnome:
@echo
@echo "...Installing launcher icon into GNOME..."
@if [ "x$(GNOME_PREFIX)" != "x" ]; then \
install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \
cp data/images/icon.png $(DESTDIR)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
cp src/tuxpaint.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
fi
# Install a launcher icon for the Nokia 770. # Install a launcher icon for the Nokia 770.
.PHONY: install-nokia770 .PHONY: install-nokia770
install-nokia770: install-nokia770:
@ -803,10 +782,11 @@ install-kde:
@echo @echo
@echo "...Installing launcher icon into KDE..." @echo "...Installing launcher icon into KDE..."
@if [ "x$(KDE_PREFIX)" != "x" ]; then \ @if [ "x$(KDE_PREFIX)" != "x" ]; then \
install -d $(DESTDIR)$(KDE_PREFIX)/Graphics; \ install -d $(DESTDIR)$(KDE_PREFIX); \
cp src/tuxpaint.desktop $(DESTDIR)$(KDE_PREFIX)/Graphics/; \ cp src/tuxpaint.desktop $(DESTDIR)$(KDE_PREFIX)/; \
chmod 644 $(DESTDIR)$(KDE_PREFIX)/Graphics/tuxpaint.desktop; \ chmod 644 $(DESTDIR)$(KDE_PREFIX)/tuxpaint.desktop; \
fi fi
kbuildsycoca4
.PHONY: install-kde-icons .PHONY: install-kde-icons
install-kde-icons: install-kde-icons:
@ -851,10 +831,8 @@ install-kde-icons:
fi fi
# Install the PNG icon (for GNOME, KDE, etc.) # Install the PNG icon (for KDE desktop, etc.)
# and the 24-color 32x32 XPM (for other Window managers): # and the 24-color 32x32 XPM (for other Window managers):
# FIXME: Should this also use $(DESTDIR)?
.PHONY: install-icon .PHONY: install-icon
install-icon: install-icon:
@echo @echo

4
docs/AUTHORS.txt
View file

@ -1051,17 +1051,18 @@ $Id$
* Ports and Packaging * Ports and Packaging
* Windows 32-bit coding and builds * Windows 32-bit coding and builds
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
John Popplewell <john@johnnypops.demon.co.uk> John Popplewell <john@johnnypops.demon.co.uk>
* Tweaks to help Windows cross-compiling under Linux * Tweaks to help Windows cross-compiling under Linux
Volker Grabsch <vog@notjusthosting.com> Volker Grabsch <vog@notjusthosting.com>
* Mac OS X coding and builds * Mac OS X coding and builds
Mark K. Kim <mkkim214@gmail.com>
Martin Fuhrer <mfuhrer@users.sourceforge.net> Martin Fuhrer <mfuhrer@users.sourceforge.net>
Darrell Walisser <walisser@mac.com> [retired] Darrell Walisser <walisser@mac.com> [retired]
Eric Poncet <http://www.linguasoft.com/> Eric Poncet <http://www.linguasoft.com/>
Harvey Ginter <harveyginter@gmail.com> Harvey Ginter <harveyginter@gmail.com>
Mark K. Kim <mkkim214@gmail.com>
Robert Buj Gelonch <rbuj@users.sf.net> Robert Buj Gelonch <rbuj@users.sf.net>
* Maemo (Nokia 770 and N880) coding and builds * Maemo (Nokia 770 and N880) coding and builds
@ -1080,6 +1081,7 @@ $Id$
Richard June <rjune@bravegnuworld.com> [backup] Richard June <rjune@bravegnuworld.com> [backup]
* Slackware Linux packages * Slackware Linux packages
Tim Dickson <dickson.tim@googlemail.com>
Torsten Giebl <wizard@turricane.org> Torsten Giebl <wizard@turricane.org>
* NetBSD packages * NetBSD packages

19
docs/CHANGES.txt
View file

@ -179,9 +179,26 @@ $Id$
Robert Buj Gelonch <rbuj@users.sf.net> Robert Buj Gelonch <rbuj@users.sf.net>
Mark K. Kim <mkkim214@gmail.com> Mark K. Kim <mkkim214@gmail.com>
* Allow to override build date (in order to make builds reproducible) * Allow override override build date (in order to make builds reproducible)
("SOURCE_DATE_EPOCH")
by Chris Lamb, pushed by Bernhard M. Wiedemann by Chris Lamb, pushed by Bernhard M. Wiedemann
* Allow specifying a suffix to the "lib" directory where
magic tools are installed.
("LIBDIRSUFFIX")
Tim Dickson <dickson.tim@googlemail.com>
* Install Tux Paint docs into a version-numbered directory
(e.g., "/usr/local/share/doc/tuxpaint-0.9.23/")
Tim Dickson <dickson.tim@googlemail.com>
* Launcher icon installation location adjustments:
* .../X11R6/include/X11/pixmaps/ -> .../share/pixmaps/
* Using kde4config (vs kdeconfig); not putting things in "Graphics" subdir.
* Removed gnome-config stuff
Tim Dickson <dickson.tim@googlemail.com>
Bill Kendrick <bill@newbreedsoftware.com>
* Other Improvements: * Other Improvements:
------------------- -------------------
* Reformatted source code via GNU Indent tool; should * Reformatted source code via GNU Indent tool; should

72
docs/en/INSTALL.txt
View file

@ -2,11 +2,11 @@ INSTALL.txt for Tux Paint
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright 2002-2007 by Bill Kendrick and others Copyright (c) 2002-2018
bill@newbreedsoftware.com Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/ http://www.tuxpaint.org/
June 27, 2002 - July 12, 2007 June 27, 2002 - August 19, 2018
$Id$ $Id$
@ -151,15 +151,15 @@ Compiling and Installation:
Prior to version 0.9.20: Prior to version 0.9.20:
$ make win32 $ make win32
$ make install-win32 $ make install-win32
$ tuxpaint $ tuxpaint
Version 0.9.20 and beyond: Version 0.9.20 and beyond:
$ make $ make
$ make install $ make install
$ tuxpaint $ tuxpaint
Use the following command to build a version suitable for Use the following command to build a version suitable for
redistribution with the installer or in a zip-file: redistribution with the installer or in a zip-file:
@ -277,6 +277,11 @@ Compiling and Installation:
$ make SDL_MIXER_LIB= $ make SDL_MIXER_LIB=
Other options:
--------------
Various other options (e.g., installation paths) may be overridden;
see them in "Makefile" for further details.
If you get errors: If you get errors:
------------------ ------------------
If you receive any errors during compile-time, make sure you have If you receive any errors during compile-time, make sure you have
@ -328,35 +333,35 @@ Compiling and Installation:
Other variables are: Other variables are:
BIN_PREFIX BIN_PREFIX
Where the "tuxpaint" binary will be installed. Where the "tuxpaint" binary will be installed.
(Set to "$(PREFIX)/bin" by default - e.g., "/usr/local/bin") (Set to "$(PREFIX)/bin" by default - e.g., "/usr/local/bin")
DATA_PREFIX DATA_PREFIX
Where the data files (sound, graphics, brushes, stamps, fonts) Where the data files (sound, graphics, brushes, stamps, fonts)
will go, and where Tux Paint will look for them when it's run. will go, and where Tux Paint will look for them when it's run.
(Set to "$(PREFIX)/share/tuxpaint") (Set to "$(PREFIX)/share/tuxpaint")
DOC_PREFIX DOC_PREFIX
Where the documentation text files (the "docs" directory) will go. Where the documentation text files (the "docs" directory) will go.
(Set to "$(PREFIX)/share/doc/tuxpaint") (Set to "$(PREFIX)/share/doc/tuxpaint")
MAN_PREFIX MAN_PREFIX
Where the manual page for Tux Paint will go. Where the manual page for Tux Paint will go.
(Set to "$(PREFIX)/share/man") (Set to "$(PREFIX)/share/man")
ICON_PREFIX $(PREFIX)/share/pixmaps ICON_PREFIX $(PREFIX)/share/pixmaps
X11_ICON_PREFIX $(PREFIX)/X11R6/include/X11/pixmaps X11_ICON_PREFIX $(PREFIX)/X11R6/include/X11/pixmaps
GNOME_PREFIX $(PREFIX)/share/gnome/apps/Graphics GNOME_PREFIX $(PREFIX)/share/gnome/apps/Graphics
KDE_PREFIX $(PREFIX)/share/applnk/Graphics KDE_PREFIX $(PREFIX)/share/applnk/Graphics
Where the icons and launchers (for GNOME and KDE) will go. Where the icons and launchers (for GNOME and KDE) will go.
LOCALE_PREFIX LOCALE_PREFIX
Where the translation files for Tux Paint will go, and where Where the translation files for Tux Paint will go, and where
Tux Paint will look for them. Tux Paint will look for them.
(Set to "$(PREFIX)/share/locale/") (Set to "$(PREFIX)/share/locale/")
(Final location of a translation file will be (Final location of a translation file will be
under the locale's directory (e.g., "es" for Spanish), under the locale's directory (e.g., "es" for Spanish),
within the "LC_MESSAGES" subdirectory.) within the "LC_MESSAGES" subdirectory.)
FIXME: This list is out of date. See Makefile and Makefile-i18n for FIXME: This list is out of date. See Makefile and Makefile-i18n for
a complete list. a complete list.
@ -404,4 +409,3 @@ Uninstalling Tux Paint:
superuser mode: superuser mode:
# exit # exit