diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2017-04-23 18:52:58 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2017-04-23 18:54:23 -0700 |
| commit | 16ffec1864e1db49866ecd684ef98a2b2ba4cf3d (patch) | |
| tree | ac26de435255c360441137c17887f687509b7666 | |
| parent | cf96845bf645266d7ec6e77a92086c8ed7a7803f (diff) | |
| download | nasm-16ffec1864e1db49866ecd684ef98a2b2ba4cf3d.tar.gz | |
nasm.spec: use a sed file to insert perl dependencies
There are just too many ways that an inline sed script can screw up.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | nasm.spec.sed | 3 |
3 files changed, 8 insertions, 2 deletions
@@ -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} |