Contents of /trunk/fltk/patches/fltk-1.3.2-conf-tests.patch
Parent Directory | Revision Log
Revision 2081 -
(show annotations)
(download)
Tue Feb 19 09:33:44 2013 UTC (11 years, 7 months ago) by niro
File size: 2862 byte(s)
Tue Feb 19 09:33:44 2013 UTC (11 years, 7 months ago) by niro
File size: 2862 byte(s)
-fltk patches
1 | diff --git a/Makefile b/Makefile |
2 | index ccec15c..747625e 100644 |
3 | --- a/Makefile |
4 | +++ b/Makefile |
5 | @@ -27,7 +27,7 @@ |
6 | |
7 | include makeinclude |
8 | |
9 | -DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation |
10 | +DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid |
11 | |
12 | all: makeinclude fltk-config |
13 | for dir in $(DIRS); do\ |
14 | @@ -35,6 +35,10 @@ all: makeinclude fltk-config |
15 | (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ |
16 | done |
17 | |
18 | +check: all |
19 | + $(MAKE) $(MFLAGS) -C test || exit 1 |
20 | + |
21 | + |
22 | install: makeinclude |
23 | -mkdir -p $(DESTDIR)$(bindir) |
24 | $(RM) $(DESTDIR)$(bindir)/fltk-config |
25 | @@ -109,9 +113,6 @@ makeinclude: configure configh.in makeinclude.in |
26 | touch config.h |
27 | chmod +x fltk-config |
28 | |
29 | -configure: configure.in |
30 | - autoconf |
31 | - |
32 | portable-dist: |
33 | epm -v -s fltk.xpm fltk |
34 | |
35 | diff --git a/documentation/Makefile b/documentation/Makefile |
36 | index 1742cfa..8102c43 100644 |
37 | --- a/documentation/Makefile |
38 | +++ b/documentation/Makefile |
39 | @@ -92,11 +92,6 @@ install: $(MANPAGES) |
40 | $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ |
41 | fi |
42 | echo "Installing man pages in $(DESTDIR)$(mandir) ..." |
43 | - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 |
44 | - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 |
45 | - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 |
46 | - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 |
47 | - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 |
48 | -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 |
49 | $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 |
50 | $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 |
51 | @@ -104,10 +99,6 @@ install: $(MANPAGES) |
52 | $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 |
53 | |
54 | install-linux install-osx: |
55 | - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 |
56 | - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 |
57 | - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 |
58 | - $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 |
59 | -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 |
60 | $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 |
61 | $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 |
62 | @@ -116,17 +107,11 @@ install-linux install-osx: |
63 | |
64 | uninstall: |
65 | $(RMDIR) $(DESTDIR)$(docdir) |
66 | - $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) |
67 | $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 |
68 | - $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) |
69 | $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 |
70 | - $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) |
71 | $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 |
72 | |
73 | uninstall-linux uninstall-osx: |
74 | - $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) |
75 | - $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) |
76 | - $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) |
77 | $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 |
78 | $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 |
79 | $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 |