Skip to content

Commit 458dc11

Browse files
committed
Alternative sed option to not create bak files
The bsd compile pull revised the sed option to use -i.bak but this left behind bak files. This alternative was found that was indicated to also be compatible without leaving bak files.
1 parent d8524bf commit 458dc11

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Makefile.in

+11-11
Original file line numberDiff line numberDiff line change
@@ -155,28 +155,28 @@ svn:
155155
svn update
156156

157157
autotools:
158-
@sed -i.bak 's/.\/commit-version.sh/.\/version.sh/g' configure.ac
158+
@sed -e 's/.\/commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv configure.ac.tmp configure.ac
159159
autoconf
160160
./configure --with-developer-flags
161161

162162
autotools-git:
163-
@sed -i.bak 's/.\/git-commit-version.sh/.\/version.sh/g' configure.ac
163+
@sed -e 's/.\/git-commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv configure.ac.tmp configure.ac
164164
autoconf
165165
./configure --with-developer-flags
166166

167167

168168
build-commit: distclean svn set-version all
169169

170170
set-version:
171-
@sed -i.bak 's/.\/version.sh/.\/commit-version.sh/g' configure.ac
171+
@sed -e 's/.\/version.sh/.\/commit-version.sh/g' configure.ac > configure.ac.tmp && mv configure.ac.tmp configure.ac
172172
autoconf
173-
@sed -i.bak 's/.\/commit-version.sh/.\/version.sh/g' configure.ac
173+
@sed -e 's/.\/commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv configure.ac.tmp configure.ac
174174
./configure --with-developer-flags
175175

176176
set-version-git:
177-
@sed -i.bak 's/.\/version.sh/.\/git-commit-version.sh/g' configure.ac
177+
@sed -e 's/.\/version.sh/.\/git-commit-version.sh/g' configure.ac > configure.ac.tmp && mv configure.ac.tmp configure.ac
178178
autoconf
179-
@sed -i.bak 's/.\/git-commit-version.sh/.\/version.sh/g' configure.ac
179+
@sed -e 's/.\/git-commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv configure.ac.tmp configure.ac
180180
./configure --with-developer-flags
181181

182182

@@ -207,11 +207,11 @@ install:
207207
mkdir -p $(DESTDIR)$(sysconfdir)/motion
208208
mkdir -p $(DESTDIR)$(docdir)
209209
mkdir -p $(DESTDIR)$(examplesdir)
210-
@sed -i.bak 's|$${prefix}|$(prefix)|' motion-dist.conf
211-
@sed -i.bak 's|$${prefix}|$(prefix)|' camera1-dist.conf
212-
@sed -i.bak 's|$${prefix}|$(prefix)|' camera2-dist.conf
213-
@sed -i.bak 's|$${prefix}|$(prefix)|' camera3-dist.conf
214-
@sed -i.bak 's|$${prefix}|$(prefix)|' camera4-dist.conf
210+
@sed -e 's|$${prefix}|$(prefix)|' motion-dist.conf > motion-dist.conf.tmp && mv motion-dist.conf.tmp motion-dist.conf
211+
@sed -e 's|$${prefix}|$(prefix)|' camera1-dist.conf > camera1-dist.conf.tmp && mv camera1-dist.conf.tmp camera1-dist.conf
212+
@sed -e 's|$${prefix}|$(prefix)|' camera2-dist.conf > camera2-dist.conf.tmp && mv camera2-dist.conf.tmp camera2-dist.conf
213+
@sed -e 's|$${prefix}|$(prefix)|' camera3-dist.conf > camera3-dist.conf.tmp && mv camera3-dist.conf.tmp camera3-dist.conf
214+
@sed -e 's|$${prefix}|$(prefix)|' camera4-dist.conf > camera4-dist.conf.tmp && mv camera4-dist.conf.tmp camera4-dist.conf
215215
$(INSTALL_DATA) motion.1 $(DESTDIR)$(mandir)/man1
216216
$(INSTALL_DATA) $(DOC) $(DESTDIR)$(docdir)
217217
$(INSTALL_DATA) $(EXAMPLES) $(DESTDIR)$(examplesdir)

0 commit comments

Comments
 (0)