Skip to content

Commit

Permalink
Fix bugs in uninstall rules.
Browse files Browse the repository at this point in the history
  • Loading branch information
dhil committed Jul 14, 2020
1 parent b20f715 commit 8c95422
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ uninstall: $(TEXINFTHESIS)/infthesis.cls
texhash --verbose $(INSTDIR) && \
echo "Uninstallation complete." || echo "Uninstallation failed."
@echo "Attempting to removing directory structure."
@rmdir -v -p $(TEXINFTHESIS) && true || true
@rmdir -v -p $(TEXINFTHESIS) || true

install-eushield:
@mkdir -v -p $(TEXEUSHIELD)
Expand All @@ -74,8 +74,8 @@ uninstall-eushield:
rm -v $(TEXEUSHIELD)/$(dep) && \
echo "Uninstallation of $(dep) complete." || echo "Uninstallation of $(dep) failed." ; \
)
texhash $(INSTDIR) && \
@rmdir -p -v $(TEXEUSHIELD) && true || true
rmdir -p -v $(TEXEUSHIELD) || true
texhash $(INSTDIR)

install-logo-inf:
@mkdir -v -p $(INFLOGODIR)
Expand All @@ -91,7 +91,7 @@ uninstall-logo-inf:
rm -v $(INFLOGODIR)/$(dep) && \
echo "Uninstallation of $(dep) complete." || echo "Uninstallation of $(dep) failed." ; \
)
@rmdir -v -p $(INFLOGODIR) && true || true
@rmdir -v -p $(INFLOGODIR) || true


install-logo-cdtppar:
Expand All @@ -105,10 +105,10 @@ install-logo-cdtppar:
uninstall-logo-cdtppar:
$(foreach dep, $(CDTPPARLOGO), \
echo "Uninstalling $(dep)..." && \
curl -o $(CDTPPARLOGODIR)/$(dep) -O $(CDTPPARURL)/$(dep) && \
rm -v $(CDTPPARLOGODIR)/$(dep) && \
echo "Uninstallation of $(dep) complete." || echo "Uninstallation of $(dep) failed." ; \
)
@rmdir -v -p $(CDTPPARLOGODIR) && true || true
@rmdir -v -p $(CDTPPARLOGODIR) || true

install-logo-epsrc:
@mkdir -v -p $(EPSRCLOGODIR)
Expand All @@ -125,7 +125,7 @@ uninstall-logo-epsrc:
$(eval dep1 = $(word 1,$(subst :, ,$(dep)))) \
$(eval dep2 = $(word 2,$(subst :, ,$(dep)))) \
echo "Uninstalling $(dep2)..." && \
curl -o $(EPSRCLOGODIR)/$(dep2) -O $(EPSRCURL)/$(dep1) && \
rm -v $(EPSRCLOGODIR)/$(dep2) && \
echo "Uninstallation of $(dep2) complete." || echo "Uninstallation of $(dep2) failed." ; \
)
@rmdir -v -p $(EPSRCLOGODIR) && true || true
@rmdir -v -p $(EPSRCLOGODIR) || true

0 comments on commit 8c95422

Please sign in to comment.