diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 4293522b84..41007e5159 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -202,7 +202,10 @@ top_builddir = . INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +# my autoconf doesn't set this +#INSTALL_SCRIPT = @INSTALL_SCRIPT@ +# maybe do an additional chmod if needed? +INSTALL_SCRIPT = @INSTALL@ transform = @program_transform_name@ NORMAL_INSTALL = : @@ -425,17 +428,17 @@ $(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDI $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) CREATE_LINKS: ./lib/@WX_TARGET_LIBRARY@ - @if test -e ./lib/@WX_LIBRARY_LINK1@; then rm -f ./lib/@WX_LIBRARY_LINK1@; fi - @if test -e ./lib/@WX_LIBRARY_LINK2@; then rm -f ./lib/@WX_LIBRARY_LINK2@; fi - @if test -e ./lib/@WX_LIBRARY_LINK3@; then rm -f ./lib/@WX_LIBRARY_LINK3@; fi + @if test -e ./lib/@WX_LIBRARY_LINK1@; then $(RM) ./lib/@WX_LIBRARY_LINK1@; fi + @if test -e ./lib/@WX_LIBRARY_LINK2@; then $(RM) ./lib/@WX_LIBRARY_LINK2@; fi + @if test -e ./lib/@WX_LIBRARY_LINK3@; then $(RM) ./lib/@WX_LIBRARY_LINK3@; fi $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@ - @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then rm -f $(libdir)/@WX_LIBRARY_LINK1@; fi - @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then rm -f $(libdir)/@WX_LIBRARY_LINK2@; fi - @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then rm -f $(libdir)/@WX_LIBRARY_LINK3@; fi + @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then $(RM) $(libdir)/@WX_LIBRARY_LINK1@; fi + @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then $(RM) $(libdir)/@WX_LIBRARY_LINK2@; fi + @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then $(RM) $(libdir)/@WX_LIBRARY_LINK3@; fi $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@ $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@ @@ -468,23 +471,28 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $( @echo " Installing wxWindows..." @echo " " + + $(INSTALL) -d $(prefix) + $(INSTALL) -d $(bindir) + $(INSTALL) -d $(libdir) + $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ - - @mkdir -p $(libdir)/wx - @mkdir -p $(libdir)/wx/include - @mkdir -p $(libdir)/wx/include/wx - @mkdir -p $(libdir)/wx/include/wx/@TOOLKIT_DIR@ + + $(INSTALL) -d $(libdir)/wx + $(INSTALL) -d $(libdir)/wx/include + $(INSTALL) -d $(libdir)/wx/include/wx + $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@ $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h - @mkdir -p $(includedir)/wx - @mkdir -p $(includedir)/wx/msw - @mkdir -p $(includedir)/wx/gtk - @mkdir -p $(includedir)/wx/motif - @mkdir -p $(includedir)/wx/html - @mkdir -p $(includedir)/wx/protocol - @mkdir -p $(includedir)/wx/unix - @mkdir -p $(includedir)/wx/generic + $(INSTALL) -d $(includedir)/wx + $(INSTALL) -d $(includedir)/wx/msw + $(INSTALL) -d $(includedir)/wx/gtk + $(INSTALL) -d $(includedir)/wx/motif + $(INSTALL) -d $(includedir)/wx/html + $(INSTALL) -d $(includedir)/wx/protocol + $(INSTALL) -d $(includedir)/wx/unix + $(INSTALL) -d $(includedir)/wx/generic @list='$(HEADERS)'; for p in $$list; do \ $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \ echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ @@ -509,16 +517,16 @@ uninstall: @echo " Uninstalling wxWindows..." @echo " " @echo " Removing library..." - @rm -f $(libdir)/@WX_TARGET_LIBRARY@ - @rm -f $(libdir)/@WX_LIBRARY_LINK1@ - @rm -f $(libdir)/@WX_LIBRARY_LINK2@ - @rm -f $(libdir)/@WX_LIBRARY_LINK3@ + @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ + @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ + @$(RM) $(libdir)/@WX_LIBRARY_LINK2@ + @$(RM) $(libdir)/@WX_LIBRARY_LINK3@ @echo " Removing helper files..." - @rm -f $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h - @rm -f $(bindir)/wx-config + @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h + @$(RM) $(bindir)/wx-config @echo " Removing headers..." @list='$(HEADERS)'; for p in $$list; do \ - rm -f $(includedir)/wx/$$p; \ + $(RM) $(includedir)/wx/$$p; \ done @echo " Removing directories..." @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi @@ -667,22 +675,22 @@ SAMPLES_DIST: dist: ALL_DIST @GUIDIST@ SAMPLES_DIST cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. - rm -f -r _dist_dir + $(RM) -r _dist_dir clean: - rm -f ./src/msw/*.o - rm -f ./src/gtk/*.o - rm -f ./src/motif/*.o - rm -f ./src/html/*.o - rm -f ./src/common/*.o - rm -f ./src/unix/*.o - rm -f ./src/generic/*.o - rm -f ./src/png/*.o - rm -f ./src/jpeg/*.o - rm -f ./src/zlib/*.o - rm -f *.o - rm -f parser.c - rm -f lexer.c - rm -f ./lib/* + $(RM) ./src/msw/*.o + $(RM) ./src/gtk/*.o + $(RM) ./src/motif/*.o + $(RM) ./src/html/*.o + $(RM) ./src/common/*.o + $(RM) ./src/unix/*.o + $(RM) ./src/generic/*.o + $(RM) ./src/png/*.o + $(RM) ./src/jpeg/*.o + $(RM) ./src/zlib/*.o + $(RM) *.o + $(RM) parser.c + $(RM) lexer.c + $(RM) ./lib/* cleanall: clean