diff --git a/.gitignore b/.gitignore index 267007b7..14eccf95 100644 --- a/.gitignore +++ b/.gitignore @@ -14,11 +14,13 @@ *.pdb *.rej *.s +*.si *.swp *.xml .*swo *~ \#* +.\#* *.bak *.tmp .git-ignore @@ -54,6 +56,7 @@ TAGS /macros/macros.c /nasm /ndisasm +/nasm.spec /nsis/arch.nsh /nsis/version.nsh /rdoff/Makefile diff --git a/Makefile.in b/Makefile.in index 6764f961..6a4010ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -425,8 +425,8 @@ perlbreq.si: $(ALLPERLSRC) sed -r -e '/perl\((strict|warnings)\)/d' | \ sort | uniq > perlbreq.si || ( rm -f perlbreq.si ; false ) -nasm.spec: nasm.spec.in version.sed perlbreq.si - sed -f version.sed -e '/@@PERLBUILDREQS@@/r perlbreq.si' \ +nasm.spec: nasm.spec.in nasm.spec.sed version.sed perlbreq.si + sed -f version.sed -f nasm.spec.sed \ < nasm.spec.in > nasm.spec || ( rm -f nasm.spec ; false ) splint: diff --git a/nasm.spec.sed b/nasm.spec.sed new file mode 100644 index 00000000..ae0d039b --- /dev/null +++ b/nasm.spec.sed @@ -0,0 +1,3 @@ +# Replace @@PERLBUILDREQS@@ with the file perlbreq.si +/@@PERLBUILDREQS@@/{r perlbreq.si +d}