fltk/patches/fltk-1.3.3-conf-tests-2.patch

diff -Naur fltk-1.3.3/documentation/Makefile fltk-1.3.3-conf-tests/documentation/Makefile
--- fltk-1.3.3/documentation/Makefile	2014-10-06 00:39:31.000000000 +0200
+++ fltk-1.3.3-conf-tests/documentation/Makefile	2015-01-15 15:21:13.208925434 +0100
@@ -84,11 +84,6 @@
 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
 	fi
 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
-	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
@@ -96,10 +91,6 @@
 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
 
 install-linux install-osx:
-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
-	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
-	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
-	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
@@ -108,17 +99,11 @@
 
 uninstall:
 	$(RMDIR) $(DESTDIR)$(docdir)
-	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
-	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
-	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
 
 uninstall-linux uninstall-osx:
-	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
-	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
-	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff -Naur fltk-1.3.3/Makefile fltk-1.3.3-conf-tests/Makefile
--- fltk-1.3.3/Makefile	2014-08-01 22:56:09.000000000 +0200
+++ fltk-1.3.3-conf-tests/Makefile	2015-01-15 17:47:43.091587926 +0100
@@ -18,7 +18,7 @@
 
 include makeinclude
 
-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid
 
 all: makeinclude fltk-config
 	for dir in $(DIRS); do\
@@ -26,6 +26,10 @@
 		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
 	done
 
+check: all	
+	$(MAKE) $(MFLAGS) -C test || exit 1
+
+
 install: makeinclude
 	-mkdir -p $(DESTDIR)$(bindir)
 	$(RM) $(DESTDIR)$(bindir)/fltk-config
@@ -100,9 +104,6 @@
 	touch config.h
 	chmod +x fltk-config
 
-configure: configure.in
-	autoconf
-
 config.guess config.sub:
 	-automake --add-missing 2> /dev/null
 	if [ ! -e config.sub   ]; then echo NOTE: Using frozen copy of config.sub;   cp misc/config.sub   . ; fi
1	niro	2531	diff -Naur fltk-1.3.3/documentation/Makefile fltk-1.3.3-conf-tests/documentation/Makefile
2			--- fltk-1.3.3/documentation/Makefile 2014-10-06 00:39:31.000000000 +0200
3			+++ fltk-1.3.3-conf-tests/documentation/Makefile 2015-01-15 15:21:13.208925434 +0100
4			@@ -84,11 +84,6 @@
5			$(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
6			fi
7			echo "Installing man pages in $(DESTDIR)$(mandir) ..."
8			- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
9			- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
10			- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
11			- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
12			- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
13			-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
14			$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
15			$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
16			@@ -96,10 +91,6 @@
17			$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
18
19			install-linux install-osx:
20			- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
21			- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
22			- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
23			- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
24			-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
25			$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
26			$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
27			@@ -108,17 +99,11 @@
28
29			uninstall:
30			$(RMDIR) $(DESTDIR)$(docdir)
31			- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
32			$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
33			- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
34			$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
35			- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
36			$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
37
38			uninstall-linux uninstall-osx:
39			- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
40			- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
41			- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
42			$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
43			$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
44			$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
45			diff -Naur fltk-1.3.3/Makefile fltk-1.3.3-conf-tests/Makefile
46			--- fltk-1.3.3/Makefile 2014-08-01 22:56:09.000000000 +0200
47			+++ fltk-1.3.3-conf-tests/Makefile 2015-01-15 17:47:43.091587926 +0100
48			@@ -18,7 +18,7 @@
49
50			include makeinclude
51
52			-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
53			+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid
54
55			all: makeinclude fltk-config
56			for dir in $(DIRS); do\
57			@@ -26,6 +26,10 @@
58			(cd $$dir; $(MAKE) $(MFLAGS)) \|\| exit 1;\
59			done
60
61			+check: all
62			+ $(MAKE) $(MFLAGS) -C test \|\| exit 1
63			+
64			+
65			install: makeinclude
66			-mkdir -p $(DESTDIR)$(bindir)
67			$(RM) $(DESTDIR)$(bindir)/fltk-config
68			@@ -100,9 +104,6 @@
69			touch config.h
70			chmod +x fltk-config
71
72			-configure: configure.in
73			- autoconf
74			-
75			config.guess config.sub:
76			-automake --add-missing 2> /dev/null
77			if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi