Browse Source

* Copy files from bingo32,binw32 directly instead of using *

peter 23 years ago
parent
commit
04f540555e
2 changed files with 9 additions and 5 deletions
  1. 4 2
      Makefile
  2. 5 3
      Makefile.fpc

+ 4 - 2
Makefile

@@ -1743,10 +1743,12 @@ installbase: build-stamp.$(OS_TARGET)
 ifndef SNAPSHOT
 ifndef SNAPSHOT
 	$(COPY) $(CVSINSTALL)/doc/*.txt $(CVSINSTALL)/doc/copying* $(CVSINSTALL)/doc/faq.* $(INSTALL_DOCDIR)
 	$(COPY) $(CVSINSTALL)/doc/*.txt $(CVSINSTALL)/doc/copying* $(CVSINSTALL)/doc/faq.* $(INSTALL_DOCDIR)
 ifeq ($(OS_TARGET),go32v2)
 ifeq ($(OS_TARGET),go32v2)
-	$(COPY) $(CVSINSTALL)/bingo32/* $(INSTALL_BINDIR)
+	$(COPY) $(CVSINSTALL)/bingo32/*.dxe $(INSTALL_BINDIR)
+	$(COPY) $(CVSINSTALL)/bingo32/*.exe $(INSTALL_BINDIR)
 endif
 endif
 ifeq ($(OS_TARGET),win32)
 ifeq ($(OS_TARGET),win32)
-	$(COPY) $(CVSINSTALL)/binw32/* $(INSTALL_BINDIR)
+	$(COPY) $(CVSINSTALL)/binw32/*.ico $(INSTALL_BINDIR)
+	$(COPY) $(CVSINSTALL)/binw32/*.dll $(INSTALL_BINDIR)
 endif
 endif
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
 	$(MAKE) -C $(CVSINSTALL)/man installman
 	$(MAKE) -C $(CVSINSTALL)/man installman

+ 5 - 3
Makefile.fpc

@@ -309,11 +309,13 @@ ifndef SNAPSHOT
         $(COPY) $(CVSINSTALL)/doc/*.txt $(CVSINSTALL)/doc/copying* $(CVSINSTALL)/doc/faq.* $(INSTALL_DOCDIR)
         $(COPY) $(CVSINSTALL)/doc/*.txt $(CVSINSTALL)/doc/copying* $(CVSINSTALL)/doc/faq.* $(INSTALL_DOCDIR)
 # bingo32 (cwsdpmi,wmemu387.dxe)
 # bingo32 (cwsdpmi,wmemu387.dxe)
 ifeq ($(OS_TARGET),go32v2)
 ifeq ($(OS_TARGET),go32v2)
-        $(COPY) $(CVSINSTALL)/bingo32/* $(INSTALL_BINDIR)
+        $(COPY) $(CVSINSTALL)/bingo32/*.dxe $(INSTALL_BINDIR)
+        $(COPY) $(CVSINSTALL)/bingo32/*.exe $(INSTALL_BINDIR)
 endif
 endif
-# binw32 (cygwin1.dll)
+# binw32 (cygwin1.dll,*.ico)
 ifeq ($(OS_TARGET),win32)
 ifeq ($(OS_TARGET),win32)
-        $(COPY) $(CVSINSTALL)/binw32/* $(INSTALL_BINDIR)
+        $(COPY) $(CVSINSTALL)/binw32/*.ico $(INSTALL_BINDIR)
+        $(COPY) $(CVSINSTALL)/binw32/*.dll $(INSTALL_BINDIR)
 endif
 endif
 # manpages for UNIX systems
 # manpages for UNIX systems
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)