From e1aab7c3043ca8f7c08b171dedf204fde92b42da Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Mon, 4 Jul 2022 20:53:45 -0400 Subject: Remove assert --- Makefile | 9 ++++++--- ldid.cpp | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 437aaee..b21f811 100644 --- a/Makefile +++ b/Makefile @@ -31,11 +31,14 @@ ldid: $(SRC:%=%.o) $(CXX) $(CXXFLAGS) -o ldid $^ $(LDFLAGS) $(LIBS) install: all - $(INSTALL) -D -m755 ldid $(DESTDIR)$(BINDIR)/ldid + $(INSTALL) -d $(DESTDIR)$(BINDIR)/ + $(INSTALL) -m755 ldid $(DESTDIR)$(BINDIR)/ldid $(LN) -sf ldid $(DESTDIR)$(BINDIR)/ldid2 - $(INSTALL) -D -m644 docs/ldid.1 $(DESTDIR)$(MANDIR)/man1/ldid.1 + $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1/ + $(INSTALL) -m644 docs/ldid.1 $(DESTDIR)$(MANDIR)/man1/ldid.1 for lang in $(MANPAGE_LANGS); do \ - $(INSTALL) -D -m644 docs/ldid.$$lang.1 $(DESTDIR)$(MANDIR)/$$lang/man1/ldid.1; \ + $(INSTALL) -d $(DESTDIR)$(MANDIR)/$$lang/man1/; \ + $(INSTALL) -m644 docs/ldid.$$lang.1 $(DESTDIR)$(MANDIR)/$$lang/man1/ldid.1; \ done clean: diff --git a/ldid.cpp b/ldid.cpp index 13e34ff..9042d87 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -3460,7 +3460,10 @@ int main(int argc, char *argv[]) { } _assert(flag_S || key.empty()); - _assert(flag_S || flag_I == NULL); + if (flag_I != NULL && !flag_S) { + fprintf(stderr, "ldid: -I requires -S\n"); + exit(1); + } if (flag_d && !flag_h) { flag_h = true; -- cgit v1.2.3-56-ge451