multipath-tools: remove incdir from Makefiles
authorBenjamin Marzinski <bmarzins@redhat.com>
Fri, 7 Apr 2017 06:16:31 +0000 (01:16 -0500)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Wed, 12 Apr 2017 07:22:25 +0000 (09:22 +0200)
Makefile.in defines both incdir and includedir, and they are both the
same. This patch removes incdir, and makes all the Makefiles use
includedir.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Makefile.inc
libmpathcmd/Makefile
libmpathpersist/Makefile

index 740081e..c8b1142 100644 (file)
@@ -55,7 +55,6 @@ man8dir               = $(prefix)/usr/share/man/man8
 man5dir                = $(prefix)/usr/share/man/man5
 man3dir                = $(prefix)/usr/share/man/man3
 syslibdir      = $(prefix)/$(LIB)
-incdir         = $(prefix)/usr/include
 libdir         = $(prefix)/$(LIB)/multipath
 unitdir                = $(prefix)/$(SYSTEMDPATH)/systemd/system
 mpathpersistdir        = $(TOPDIR)/libmpathpersist
index b8e29cb..9cda94c 100644 (file)
@@ -16,13 +16,13 @@ install: $(LIBS)
        $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
        $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
        $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
-       $(INSTALL_PROGRAM) -d $(DESTDIR)$(incdir)
-       $(INSTALL_PROGRAM) -m 644 mpath_cmd.h $(DESTDIR)$(incdir)
+       $(INSTALL_PROGRAM) -d $(DESTDIR)$(includedir)
+       $(INSTALL_PROGRAM) -m 644 mpath_cmd.h $(DESTDIR)$(includedir)
 
 uninstall:
        $(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
        $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
-       $(RM) $(DESTDIR)$(incdir)/mpath_cmd.h
+       $(RM) $(DESTDIR)$(includedir)/mpath_cmd.h
 
 clean:
        $(RM) core *.a *.o *.so *.so.* *.gz
index 96da639..857c8d8 100644 (file)
@@ -24,17 +24,17 @@ install: $(LIBS)
        $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
        $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
        $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
-       $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(incdir)
+       $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
        $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
        $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
        $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
-       $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(incdir)
+       $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
 
 uninstall:
        $(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
        $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
        $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
-       $(RM) $(DESTDIR)$(incdir)/mpath_persist.h
+       $(RM) $(DESTDIR)$(includedir)/mpath_persist.h
        $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
 
 clean: