libdmmp: minor Makefile cleanup
authorBenjamin Marzinski <bmarzins@redhat.com>
Fri, 7 Apr 2017 06:16:30 +0000 (01:16 -0500)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Wed, 12 Apr 2017 07:22:23 +0000 (09:22 +0200)
This patch deletes the "/" after $(DESTDIR) and removes
libdmmp_speed_test on 'make clean'

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
libdmmp/Makefile
libdmmp/test/Makefile

index 082078a..1c5329a 100644 (file)
@@ -29,27 +29,27 @@ $(LIBS): $(OBJS)
 install:
        $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
        $(INSTALL_PROGRAM) -m 644 -D \
-               $(HEADERS) $(DESTDIR)/$(includedir)/$(HEADERS)
-       $(LN) $(LIBS) $(DESTDIR)/$(syslibdir)/$(DEVLIB)
+               $(HEADERS) $(DESTDIR)$(includedir)/$(HEADERS)
+       $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
        $(INSTALL_PROGRAM) -m 644 -D \
-               $(PKGFILE).in $(DESTDIR)/$(pkgconfdir)/$(PKGFILE)
+               $(PKGFILE).in $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
        perl -i -pe 's|__VERSION__|$(LIBDMMP_VERSION)|g' \
-               $(DESTDIR)/$(pkgconfdir)/$(PKGFILE)
+               $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
        perl -i -pe 's|__LIBDIR__|$(syslibdir)|g' \
-               $(DESTDIR)/$(pkgconfdir)/$(PKGFILE)
+               $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
        perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
-               $(DESTDIR)/$(pkgconfdir)/$(PKGFILE)
+               $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
        @for file in docs/man/*.3.gz; do \
                $(INSTALL_PROGRAM) -m 644 -D \
                        $$file \
-                       $(DESTDIR)/$(man3dir)/ || exit $?; \
+                       $(DESTDIR)$(man3dir)/ || exit $?; \
        done
 
 uninstall:
        $(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
        $(RM) $(DESTDIR)$(includedir)/$(HEADERS)
-       $(RM) $(DESTDIR)/$(syslibdir)/$(DEVLIB)
-       @for file in $(DESTDIR)/$(man3dir)/dmmp_*; do \
+       $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+       @for file in $(DESTDIR)$(man3dir)/dmmp_*; do \
                $(RM) $$file; \
        done
        $(RM) $(DESTDIR)$(man3dir)/libdmmp.h*
index 68f1af3..acfb3bf 100644 (file)
@@ -27,4 +27,4 @@ speed_test: $(SPD_TEST_EXEC)
                time -p ./$(SPD_TEST_EXEC)
 
 clean:
-       rm -f $(TEST_EXEC)
+       rm -f $(TEST_EXEC) $(SPD_TEST_EXEC)