Applied TRUE/FALSE fix here too.

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5394eb0c220c1dc7485839a3263a67b62d9d36c4..0c706ee022a453ebee9a548d108ccfae246d79e7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -485,11 +485,12 @@ uninstall:
        @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
        @$(RM) $(bindir)/wx-config
        @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
        @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
        @$(RM) $(bindir)/wx-config
        @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config

-       @$(RM) $(datadir)/wx/afm/*
-       @$(RM) $(datadir)/wx/gs_afm/*
+       @$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
+       @$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*

 # FIXME: wxBase doesnt install these next 3 dirs.
 # FIXME: wxBase doesnt install these next 3 dirs.

-       @-rmdir $(datadir)/wx/gs_afm
-       @-rmdir $(datadir)/wx/afm
+       @-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+       @-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
+       @-rmdir $(datadir)/wx/$(VER_MAJMIN)

        @-rmdir $(datadir)/wx
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
        @-rmdir $(datadir)/wx
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \


@@ -581,14 +582,18 @@ ALL_GUI_DIST: ALL_DIST
        cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
        cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
        cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
        cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
        cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
        cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic

-       cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic

        cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
        cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
        cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
        cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
        cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
        cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol

+       mkdir $(DISTDIR)/art
+       mkdir $(DISTDIR)/art/gtk
+       mkdir $(DISTDIR)/art/motif
+       cp $(WXDIR)/art/*.xpm $(DISTDIR)/art
+       cp $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
+       cp $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif

        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/generic
        mkdir $(DISTDIR)/src/html
        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/generic
        mkdir $(DISTDIR)/src/html

-       mkdir $(DISTDIR)/src/html/bitmaps

        mkdir $(DISTDIR)/src/$(TOOLKITDIR)
        mkdir $(DISTDIR)/src/png
        mkdir $(DISTDIR)/src/jpeg
        mkdir $(DISTDIR)/src/$(TOOLKITDIR)
        mkdir $(DISTDIR)/src/png
        mkdir $(DISTDIR)/src/jpeg


@@ -609,7 +614,6 @@ ALL_GUI_DIST: ALL_DIST
        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
        cp $(GENDIR)/*.mms $(DISTDIR)/src/generic
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
        cp $(GENDIR)/*.mms $(DISTDIR)/src/generic
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html

-       cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps

        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
        cp $(PNGDIR)/*.c $(DISTDIR)/src/png
        cp $(PNGDIR)/README $(DISTDIR)/src/png
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
        cp $(PNGDIR)/*.c $(DISTDIR)/src/png
        cp $(PNGDIR)/README $(DISTDIR)/src/png


@@ -673,7 +677,6 @@ BASE_DIST: ALL_DIST
 GTK_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxGTK.spec $(DISTDIR)
        cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
 GTK_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxGTK.spec $(DISTDIR)
        cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk

-       cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk

        cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
        cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk