Skip to content

Commit

Permalink
nasm.spec: use a sed file to insert perl dependencies
Browse files Browse the repository at this point in the history
There are just too many ways that an inline sed script can screw up.

Signed-off-by: H. Peter Anvin <[email protected]>
  • Loading branch information
H. Peter Anvin committed Apr 24, 2017
1 parent cf96845 commit 16ffec1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
*.pdb
*.rej
*.s
*.si
*.swp
*.xml
.*swo
*~
\#*
.\#*
*.bak
*.tmp
.git-ignore
Expand Down Expand Up @@ -54,6 +56,7 @@ TAGS
/macros/macros.c
/nasm
/ndisasm
/nasm.spec
/nsis/arch.nsh
/nsis/version.nsh
/rdoff/Makefile
Expand Down
4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions nasm.spec.sed
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Replace @@PERLBUILDREQS@@ with the file perlbreq.si
/@@PERLBUILDREQS@@/{r perlbreq.si
d}

0 comments on commit 16ffec1

Please sign in to comment.