Skip to content

Commit

Permalink
Fix Makefiles not to create files in root dir
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Loesch authored and pmelange committed Aug 7, 2023
1 parent 25a1e65 commit ef5a1a1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ endif
cfgparser: $(CFGDEPS) src/builddata.o
$(MAKECMDPREFIX)$(MAKECMD) -C $(CFGDIR)

switch:
switch:
$(MAKECMDPREFIX)$(MAKECMD) -C $(SWITCHDIR)

# generate it always
Expand Down Expand Up @@ -174,12 +174,12 @@ install_olsrd: install_bin
@echo per default.
@echo can be found at files/olsrd.conf.default.lq
@echo ==========================================================
mkdir -p $(ETCDIR)
$(MAKECMDPREFIX)if [ -e $(CFGFILE) ]; then \
cp -f files/olsrd.conf.default.lq $(CFGFILE).new; \
mkdir -p ${TOPDIR}$(ETCDIR)
$(MAKECMDPREFIX)if [ -e ${TOPDIR}$(CFGFILE) ]; then \
cp -f files/olsrd.conf.default.lq ${TOPDIR}$(CFGFILE).new; \
echo "Configuration file was saved as $(CFGFILE).new"; \
else \
cp -f files/olsrd.conf.default.lq $(CFGFILE); \
cp -f files/olsrd.conf.default.lq ${TOPDIR}$(CFGFILE); \
fi
@echo -------------------------------------------
@echo Edit $(CFGFILE) before running olsrd!!
Expand Down
4 changes: 2 additions & 2 deletions lib/pud/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ install: all
$(MAKECMDPREFIX)$(MAKE) -C "$(NMEALIB_PATH)" DESTDIR="$(DESTDIR)" install
$(MAKECMDPREFIX)$(MAKE) -C "$(LIBRARY_PATH)" DESTDIR="$(DESTDIR)" install
$(INSTALL_LIB)
mkdir -p "$(ETCDIR)"
cp "$(RESOURCESDIR)/olsrd.pud.position.conf" "$(ETCDIR)"
mkdir -p "${TOPDIR}$(ETCDIR)"
cp "$(RESOURCESDIR)/olsrd.pud.position.conf" "${TOPDIR}$(ETCDIR)"
$(STRIP) "$(LIBDIR)/$(PLUGIN_FULLNAME)"
ifneq ($(DOCDIR_OLSRD),)
mkdir -p "$(DOCDIR_OLSRD)"
Expand Down
4 changes: 2 additions & 2 deletions lib/sgwdynspeed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ endif

install: all
$(INSTALL_LIB)
mkdir -p "$(ETCDIR)"
cp "$(RESOURCESDIR)/olsrd.sgw.speed.conf" "$(ETCDIR)"
mkdir -p "${TOPDIR}$(ETCDIR)"
cp "$(RESOURCESDIR)/olsrd.sgw.speed.conf" "${TOPDIR}$(ETCDIR)"
$(STRIP) "$(LIBDIR)/$(PLUGIN_FULLNAME)"
ifneq ($(DOCDIR_OLSRD),)
mkdir -p "$(DOCDIR_OLSRD)"
Expand Down

0 comments on commit ef5a1a1

Please sign in to comment.