Remove hard-coded path names to build for both 32- and 64-bit

Change-Id: If4ff667728e586fdcecb1cccf22ba3c89a53e9ec

diff --git a/Makefile b/Makefile
index c58d1d5..7c07759 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,27 +40,26 @@ clean:
        done
 
 install: all
-       cp $(SRC_DIR)/gbm.h $(prefix)/include/
-       -mkdir $(prefix)/include/gbm
-#      cp $(SRC_DIR)/gbm.h $(prefix)/include/gbm/
-       cp $(SRC_DIR)/backend.h $(prefix)/include/gbm/
-       cp $(SRC_DIR)/common_drm.h $(prefix)/include/gbm/
-       cp $(SRC_DIR)/common.h $(prefix)/include/gbm/
-       cp $(SRC_DIR)/gbmint.h $(prefix)/include/gbm/
-       cp pkgconfig/gbm.pc $(prefix)/lib/pkgconfig/
-       cp libgbm.so.$(GBM_SO_VER) $(prefix)/lib/
+       cp $(SRC_DIR)/gbm.h $(includedir)/
+       -mkdir $(includedir)/gbm/
+       cp $(SRC_DIR)/backend.h $(includedir)/gbm/
+       cp $(SRC_DIR)/common_drm.h $(includedir)/gbm/
+       cp $(SRC_DIR)/common.h $(includedir)/gbm/
+       cp $(SRC_DIR)/gbmint.h $(includedir)/gbm/
+       cp pkgconfig/gbm.pc $(libdir)/pkgconfig/
+       cp libgbm.so.$(GBM_SO_VER) $(libdir)/
        @for dir in $(GBM_BACKENDS_DIR) ; do \
                $(MAKE) $@ -C $$dir ; \
        done
 
 uninstall:
-       -rm -f $(prefix)/include/gbm.h
-       -rm -f $(prefix)/include/gbm/backend.h
-       -rm -f $(prefix)/include/gbm/common_drm.h
-       -rm -f $(prefix)/include/gbm/common.h
-       -rm -f $(prefix)/include/gbm/gbmint.h
-       -rm -f $(prefix)/lib/pkgconfig/gbm.pc
-       -rm -f $(prefix)/lib/libgbm.so.$(GBM_SO_VER)
+       -rm -f $(includedir)/gbm.h
+       -rm -f $(includedir)/gbm/backend.h
+       -rm -f $(includedir)/gbm/common_drm.h
+       -rm -f $(includedir)/gbm/common.h
+       -rm -f $(includedir)/gbm/gbmint.h
+       -rm -f $(libdir)/pkgconfig/gbm.pc
+       -rm -f $(libdir)/libgbm.so.$(GBM_SO_VER)
        @for dir in $(GBM_BACKENDS_DIR) ; do \
                $(MAKE) $@ -C $$dir ; \
        done

diff --git a/packaging/libgbm.spec b/packaging/libgbm.spec
index 628a849..2a5c7f2 100644 (file)
--- a/packaging/libgbm.spec
+++ b/packaging/libgbm.spec
@@ -7,8 +7,6 @@ License:    MIT
 
 Source0:    %{name}.tar.gz
 
-Provides:   libgbm.so
-
 # Requirements
 BuildRequires:  autoconf
 BuildRequires:  libtool
@@ -32,7 +30,6 @@ Development header files for use with Wayland GBM
 
 %build
 export GBM_SO_VER=%{version}
-make clean
 make
 
 %install