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
INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib/tuxpaint/plugins
MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
# Docs and man page:
DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint
DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-dev
DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
@ -189,10 +188,10 @@ endif
# Icons and launchers:
ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null)
KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
KDE_PREFIX:=$(shell kde-config --install xdgdata-apps --expandvars 2> /dev/null)
KDE_ICON_PREFIX:=$(shell kde4-config --install icon --expandvars 2> /dev/null)
# Maemo flag
MAEMOFLAG:=
@ -464,7 +463,7 @@ trans:
windows_ARCH_INSTALL:=
osx_ARCH_INSTALL:=install-macbundle TuxPaint.dmg
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)
# "make install" installs all of the various parts
@ -604,15 +603,10 @@ clean:
# are the same as they were when you installed, of course!!!
.PHONY: uninstall
uninstall: uninstall-i18n
-if [ "x$(GNOME_PREFIX)" != "x" ]; then \
rm $(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
rm $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
else \
rm /usr/share/applications/tuxpaint.desktop; \
rm /usr/share/pixmaps/tuxpaint.png; \
fi
-rm /usr/share/applications/tuxpaint.desktop; \
-rm /usr/share/pixmaps/tuxpaint.png; \
-if [ "x$(KDE_PREFIX)" != "x" ]; then \
rm $(KDE_PREFIX)/Graphics/tuxpaint.desktop; \
rm $(KDE_PREFIX)/tuxpaint.desktop; \
fi
-rm $(ICON_PREFIX)/tuxpaint.png
-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 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.
.PHONY: install-nokia770
install-nokia770:
@ -803,10 +782,11 @@ install-kde:
@echo
@echo "...Installing launcher icon into KDE..."
@if [ "x$(KDE_PREFIX)" != "x" ]; then \
install -d $(DESTDIR)$(KDE_PREFIX)/Graphics; \
cp src/tuxpaint.desktop $(DESTDIR)$(KDE_PREFIX)/Graphics/; \
chmod 644 $(DESTDIR)$(KDE_PREFIX)/Graphics/tuxpaint.desktop; \
install -d $(DESTDIR)$(KDE_PREFIX); \
cp src/tuxpaint.desktop $(DESTDIR)$(KDE_PREFIX)/; \
chmod 644 $(DESTDIR)$(KDE_PREFIX)/tuxpaint.desktop; \
fi
kbuildsycoca4
.PHONY: install-kde-icons
install-kde-icons:
@ -851,10 +831,8 @@ install-kde-icons:
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):
# FIXME: Should this also use $(DESTDIR)?
.PHONY: install-icon
install-icon:
@echo

36
docs/AUTHORS.txt
View file

@ -151,7 +151,7 @@ $Id$
DEALINGS IN THE SOFTWARE.
Pere Pujal i Carabantes <perepujal@gmail.com> for gluing all toghether
Joystick control
Ankit Choudary <ankit.goaldecided@gmail.com>, as part of GSOC 2010,
@ -350,10 +350,10 @@ $Id$
* Voice of Tux the Penguin
Daniel 'TuxthePenguin' Alston <supertuxfansite@gmail.com>
* Cartoon
* "cartoon6.wav" from http://www.grsites.com/
* Many others taken from various sources on the web.
* Edited using SOX
@ -422,7 +422,7 @@ $Id$
http://soundbible.com/417-Right-Channel-Scramble.html
Right channel scramble by Mike Koenig
Creative Commons attribution licence 3.0
* Calligraphy sound (calligraphy.ogg)
http://soundbible.com/214-Tearing-Paper.html
Tearing Paper by Mike Koenig
@ -541,7 +541,7 @@ $Id$
* Bosnian
Samir Ribić
* Breton
Korvigelloù An Drouizi (Philippe) <drouizig@drouizig.org>
@ -584,7 +584,7 @@ $Id$
* Croatian
Nedjeljko Jedvaj <jedvaj.nedeljko@lexunit.com>
Paulo Pavačić
* Czech
Peter Sterba <sterba@sterba.com>
Martin <barin@email.cz>
@ -647,14 +647,14 @@ $Id$
* Gaelic (Scottish)
Fòram na Gàidhlig
* Galician
Leandro Regueiro <leandro.regueiro@gmail.com>
Miguel Bouzada
* Georgian and Georgian TrueType Font (GPL)
Gia Shervashidze <giasher@gmail.com>
* German
Fabian Franz <FabianFranz@gmx.de>
Roland Illig <roland.illig@gmx.de>
@ -662,7 +662,7 @@ $Id$
Burkhard Lück <lueck@hube-lueck.de>
Holger Wansing
Pfannenstein Erik (website)
* Gronings
J.F.M. Lange <jfm.lange@hky.de>
@ -714,7 +714,7 @@ $Id$
Simona Riva <simona.riva@tiscali.it>
Marco Milanesi <kpanic@pavia.linux.it>
Flavio Pastor <flavio.pastore@zonaitalia.it>
* Japanese
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
@ -757,10 +757,10 @@ $Id$
* Korean
Mark K. Kim <mkkim214@gmail.com>
* Korean Input Method
Mark K. Kim <mkkim214@gmail.com>
* Kurdish
Amed Çeko Jiyan <amedcj@gmail.com>
@ -885,12 +885,12 @@ $Id$
Silvio Faria <sirofa2003@yahoo.com.br>
Adorilson Bezerra de Araujo <adorilson@gmail.com>
Frederico Goncalves Guimaraes <frederico@teia.bio.br>
* Portuguese (Portugal)
Sergio Marques <smarquespt@gmail.com>
Ricardo Cruz <rpmcruz@clix.pt>
Helder Correia <helder.pereira.correia@gmail.com>
* Romanian
Sorin Paliga <sorin.paliga@gmail.com>
Laurentiu Buzdugan
@ -924,7 +924,7 @@ $Id$
* Serbian latin
Ivana <reci.ne.silvesteru@gmail.com>
* Shuswap (Secwepemctín)
Neskie Manuel <neskiem@gmail.com>
@ -1044,24 +1044,25 @@ $Id$
* Zapoteco
Rodrigo Perez Ramirez and Indigenas Sin Fronteras <isf_mx@yahoo.com>
* Zulu
sipho <sipho@translate.org.za>
* Ports and Packaging
* Windows 32-bit coding and builds
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
John Popplewell <john@johnnypops.demon.co.uk>
* Tweaks to help Windows cross-compiling under Linux
Volker Grabsch <vog@notjusthosting.com>
* Mac OS X coding and builds
Mark K. Kim <mkkim214@gmail.com>
Martin Fuhrer <mfuhrer@users.sourceforge.net>
Darrell Walisser <walisser@mac.com> [retired]
Eric Poncet <http://www.linguasoft.com/>
Harvey Ginter <harveyginter@gmail.com>
Mark K. Kim <mkkim214@gmail.com>
Robert Buj Gelonch <rbuj@users.sf.net>
* Maemo (Nokia 770 and N880) coding and builds
@ -1080,6 +1081,7 @@ $Id$
Richard June <rjune@bravegnuworld.com> [backup]
* Slackware Linux packages
Tim Dickson <dickson.tim@googlemail.com>
Torsten Giebl <wizard@turricane.org>
* NetBSD packages

19
docs/CHANGES.txt
View file

@ -179,9 +179,26 @@ $Id$
Robert Buj Gelonch <rbuj@users.sf.net>
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
* 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:
-------------------
* Reformatted source code via GNU Indent tool; should

112
docs/en/INSTALL.txt
View file

@ -2,11 +2,11 @@ INSTALL.txt for Tux Paint
Tux Paint - A simple drawing program for children.
Copyright 2002-2007 by Bill Kendrick and others
bill@newbreedsoftware.com
Copyright (c) 2002-2018
Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/
June 27, 2002 - July 12, 2007
June 27, 2002 - August 19, 2018
$Id$
@ -17,7 +17,7 @@ Requirements:
The Windows version of Tux Paint comes pre-packaged with the
necessary pre-compiled libraries (in ".DLL" form), so no extra
downloading is needed.
libSDL
------
Tux Paint requires the Simple DirectMedia Layer Library (libSDL),
@ -55,7 +55,7 @@ Requirements:
free, LGPL'd libraries. Under Linux, just like SDL, they should
either already be installed, or are readily available for installation
as part of your Linux distribution.
libPNG
------
Tux Paint uses PNG (Portable Network Graphics) format for its
@ -127,7 +127,7 @@ Requirements:
tools.)
http://netpbm.sourceforge.net/
Compiling and Installation:
---------------------------
@ -141,25 +141,25 @@ Compiling and Installation:
----------
Tux Paint comes pre-compiled for Windows, so no compilation is
necessary.
As of February 2005 (starting with Tux Paint 0.9.15), the Makefile
includes support for building on a Windows system using MinGW/MSYS.
( http://www.mingw.org/ )
After configuring the environment and building and installing all the
dependencies, use these commands, in MSYS, to build, install and run:
Prior to version 0.9.20:
$ make win32
$ make install-win32
$ tuxpaint
$ make win32
$ make install-win32
$ tuxpaint
Version 0.9.20 and beyond:
$ make
$ make install
$ tuxpaint
$ make
$ make install
$ tuxpaint
Use the following command to build a version suitable for
redistribution with the installer or in a zip-file:
@ -176,7 +176,7 @@ Compiling and Installation:
here:
http://johnnypops.demon.co.uk/mingw/index.html
Read the relevant notes if building for Win9X/ME.
Installer:
@ -202,7 +202,7 @@ Compiling and Installation:
-----------------------------------------
To change program settings, right-click on the TuxPaint shortcut
and select 'Properties' (at the bottom).
Make sure the 'Shortcut' tab is selected in the window that
appears, and examine the 'Target:' field. You should see
something like this :
@ -211,7 +211,7 @@ Compiling and Installation:
You can now add command-line options which will be enabled when
you double-click the icon.
For example, to make the game run in fullscreen mode,
with simple shapes (no rotation option) and in French,
add the options (after 'TuxPaint.exe'), like so:
@ -219,11 +219,11 @@ Compiling and Installation:
"C:\Program Files\TuxPaint\TuxPaint.exe" -f -s --lang french
(See "README.txt" for a full list of available command-line options.)
If you make a mistake or it all disappears use Ctrl-Z to undo or
just hit the [ESC] key and the box will close with no changes made
(unless you pushed the "Apply" button!).
When you have finished, click "OK."
If Something Goes Wrong
@ -232,12 +232,12 @@ Compiling and Installation:
nothing happens, it is probably because some of these command-line
options are wrong. Open an Explorer like before, and look for a file
called 'stderr.txt' in the TuxPaint folder.
It will contain a description of what was wrong. Usually it will
just be due to incorrect character-case (capital 'Z' instead
of lowercase 'z') or a missing (or extra) '-' (dash).
Linux/Unix Users:
-----------------
Compiling:
@ -277,6 +277,11 @@ Compiling and Installation:
$ 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 receive any errors during compile-time, make sure you have
@ -328,40 +333,40 @@ Compiling and Installation:
Other variables are:
BIN_PREFIX
Where the "tuxpaint" binary will be installed.
(Set to "$(PREFIX)/bin" by default - e.g., "/usr/local/bin")
DATA_PREFIX
Where the data files (sound, graphics, brushes, stamps, fonts)
will go, and where Tux Paint will look for them when it's run.
(Set to "$(PREFIX)/share/tuxpaint")
DOC_PREFIX
Where the documentation text files (the "docs" directory) will go.
(Set to "$(PREFIX)/share/doc/tuxpaint")
MAN_PREFIX
Where the manual page for Tux Paint will go.
(Set to "$(PREFIX)/share/man")
ICON_PREFIX $(PREFIX)/share/pixmaps
X11_ICON_PREFIX $(PREFIX)/X11R6/include/X11/pixmaps
GNOME_PREFIX $(PREFIX)/share/gnome/apps/Graphics
KDE_PREFIX $(PREFIX)/share/applnk/Graphics
Where the icons and launchers (for GNOME and KDE) will go.
LOCALE_PREFIX
Where the translation files for Tux Paint will go, and where
Tux Paint will look for them.
(Set to "$(PREFIX)/share/locale/")
(Final location of a translation file will be
under the locale's directory (e.g., "es" for Spanish),
within the "LC_MESSAGES" subdirectory.)
Where the "tuxpaint" binary will be installed.
(Set to "$(PREFIX)/bin" by default - e.g., "/usr/local/bin")
DATA_PREFIX
Where the data files (sound, graphics, brushes, stamps, fonts)
will go, and where Tux Paint will look for them when it's run.
(Set to "$(PREFIX)/share/tuxpaint")
DOC_PREFIX
Where the documentation text files (the "docs" directory) will go.
(Set to "$(PREFIX)/share/doc/tuxpaint")
MAN_PREFIX
Where the manual page for Tux Paint will go.
(Set to "$(PREFIX)/share/man")
ICON_PREFIX $(PREFIX)/share/pixmaps
X11_ICON_PREFIX $(PREFIX)/X11R6/include/X11/pixmaps
GNOME_PREFIX $(PREFIX)/share/gnome/apps/Graphics
KDE_PREFIX $(PREFIX)/share/applnk/Graphics
Where the icons and launchers (for GNOME and KDE) will go.
LOCALE_PREFIX
Where the translation files for Tux Paint will go, and where
Tux Paint will look for them.
(Set to "$(PREFIX)/share/locale/")
(Final location of a translation file will be
under the locale's directory (e.g., "es" for Spanish),
within the "LC_MESSAGES" subdirectory.)
FIXME: This list is out of date. See Makefile and Makefile-i18n for
a complete list.
Uninstalling Tux Paint:
-----------------------
Windows
@ -404,4 +409,3 @@ Uninstalling Tux Paint:
superuser mode:
# exit