Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / src / glu / Makefile

diff --git a/src/glu/Makefile b/src/glu/Makefile
index 836baa684cb730e16a822938baded5d84bcf8c60..b025a90b675760ce1e44fd5ad8e51b1fbe52c93d 100644 (file)
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -10,24 +10,26 @@ SUBDIRS = $(GLU_DIRS)
 
 default: $(TOP)/configs/current
        @for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; $(MAKE)) ; \
+               (cd $$dir && $(MAKE)) || exit 1 ; \
        done
 
 # GLU pkg-config file
 pcedit = sed \
        -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-       -e 's,@LIB_DIR@,$(LIB_DIR),' \
+       -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
+       -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
        -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'
 glu.pc: glu.pc.in
        $(pcedit) $< > $@
 
 install: glu.pc
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
-       $(INSTALL) $(TOP)/$(LIB_DIR)/libGLU.* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-       $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+       $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLU_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 clean:
-       @for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; $(MAKE) clean) ; \
+       -@for dir in $(SUBDIRS) ; do \
+               (cd $$dir && $(MAKE) clean) ; \
        done
+       -rm -f *.pc