diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2007-08-29 15:43:59 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2007-08-29 15:43:59 +0000 |
| commit | 935c1df694fe30709cc1a80ffdcbd17ff8432210 (patch) | |
| tree | 668a24e747e237e91a94f478aac55e442f2e2617 | |
| parent | 1ff5f164f026665c741bebc70daed592d46924bb (diff) | |
| download | buildroot-novena-935c1df694fe30709cc1a80ffdcbd17ff8432210.tar.gz buildroot-novena-935c1df694fe30709cc1a80ffdcbd17ff8432210.zip | |
Use DISTCC_BUILDDIR instead of DISTCC_DIR as that environment variable is
used by distcc itself, causing havoc if you compile buildroot under distcc.
| -rw-r--r-- | package/distcc/distcc.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 6c6b4ba86..576046d78 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -7,7 +7,7 @@ DISTCC_VERSION:=2.18.3 DISTCC_SOURCE:=distcc-$(DISTCC_VERSION).tar.bz2 DISTCC_CAT:=$(BZCAT) DISTCC_SITE:=http://distcc.samba.org/ftp/distcc/ -DISTCC_DIR:=$(BUILD_DIR)/distcc-$(DISTCC_VERSION) +DISTCC_BUILDDIR:=$(BUILD_DIR)/distcc-$(DISTCC_VERSION) DISTCC_BINARY:=distcc DISTCC_TARGET_BINARY:=usr/bin/distcc @@ -16,13 +16,13 @@ $(DL_DIR)/$(DISTCC_SOURCE): distcc-source: $(DL_DIR)/$(CVS_SOURCE) -$(DISTCC_DIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE) +$(DISTCC_BUILDDIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE) $(DISTCC_CAT) $(DL_DIR)/$(DISTCC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(CONFIG_UPDATE) $(DISTCC_DIR) - touch $(DISTCC_DIR)/.unpacked + $(CONFIG_UPDATE) $(DISTCC_BUILDDIR) + touch $(DISTCC_BUILDDIR)/.unpacked -$(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked - (cd $(DISTCC_DIR); rm -rf config.cache; \ +$(DISTCC_BUILDDIR)/.configured: $(DISTCC_BUILDDIR)/.unpacked + (cd $(DISTCC_BUILDDIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ @@ -43,24 +43,24 @@ $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked --without-gtk \ --without-gnome \ ) - touch $(DISTCC_DIR)/.configured + touch $(DISTCC_BUILDDIR)/.configured -$(DISTCC_DIR)/$(DISTCC_BINARY): $(DISTCC_DIR)/.configured - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DISTCC_DIR) +$(DISTCC_BUILDDIR)/$(DISTCC_BINARY): $(DISTCC_BUILDDIR)/.configured + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DISTCC_BUILDDIR) -$(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_DIR)/$(DISTCC_BINARY) - install -D $(DISTCC_DIR)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d - install -D $(DISTCC_DIR)/$(DISTCC_BINARY) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) +$(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_BUILDDIR)/$(DISTCC_BINARY) + install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d + install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) distcc: uclibc $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) distcc-clean: rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d - -$(MAKE) -C $(DISTCC_DIR) clean + -$(MAKE) -C $(DISTCC_BUILDDIR) clean distcc-dirclean: - rm -rf $(DISTCC_DIR) + rm -rf $(DISTCC_BUILDDIR) ############################################################# # # Toplevel Makefile options |