Yet another attempt at getting the paths to work

diff --git a/Makefile b/Makefile
index 791d9f1..e6797fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ SOURCES = $(CSRC) *.h $(NASMSRC) *.inc
 BTARGET = kwdhash.gen version.gen ldlinux.bss ldlinux.sys ldlinux.bin \
          pxelinux.0 mbr.bin isolinux.bin isolinux-debug.bin libsyslinux.a
 ITARGET = syslinux.com syslinux copybs.com gethostip mkdiskimage
-DOCS    = COPYING NEWS README TODO *.doc sample com32/include
+DOCS    = COPYING NEWS README TODO *.doc sample com32
 OTHER   = Makefile bin2c.pl now.pl genhash.pl keywords findpatch.pl \
          keytab-lilo.pl version version.pl sys2ansi.pl \
          ppmtolss16 lss16toppm memdisk bin2hex.pl mkdiskimage.in

diff --git a/Makefile.private b/Makefile.private
index b720871..5c36e6b 100644 (file)
--- a/Makefile.private
+++ b/Makefile.private
@@ -18,7 +18,7 @@
 #
 .PHONY: official release
 
-PRIVATE = Makefile.private .depend memdisk/.depend
+PRIVATE = Makefile.private .depend memdisk/.depend com32/lib
 
 isolinux.iso: all
        cp isolinux-debug.bin isolinux-test/isolinux/isolinux.bin
@@ -40,8 +40,7 @@ release:
        -rm -rf release/syslinux-$(VERSION)
        -rm -f release/syslinux-$(VERSION).*
        mkdir -p release/syslinux-$(VERSION)
-       mkdir -p release/syslinux-$(VERSION)/com32
-       cp -rP $(SOURCES) $(DOCS) $(OTHER) release/syslinux-$(VERSION)
+       cp -dR $(SOURCES) $(DOCS) $(OTHER) release/syslinux-$(VERSION)
        find release/syslinux-$(VERSION) -name CVS -type d -print0 | \
                xargs -0rt rm -rf
        ln -f $(PRIVATE) release/syslinux-$(VERSION)
@@ -64,8 +63,7 @@ prerel:
        -rm -rf $(PRERELDIR)/$(PREREL)
        -rm -f $(PRERELDIR)/$(PREREL).*
        mkdir -p $(PRERELDIR)/$(PREREL)
-       mkdir -p $(PRERELDIR)/$(PREREL)/com32
-       cp -rP $(SOURCES) $(DOCS) $(OTHER) $(PRERELDIR)/$(PREREL)
+       cp -dR $(SOURCES) $(DOCS) $(OTHER) $(PRERELDIR)/$(PREREL)
        find $(PRERELDIR)/$(PREREL) -name CVS -type d -print0 | \
                xargs -0rt rm -rf
        make -C $(PRERELDIR)/$(PREREL) spotless