Re: bug in mesa configure.ac?

View: New views
4 Messages — Rating Filter:   Alert me  

Parent Message unknown Re: bug in mesa configure.ac?

by Dan Nicholson-2 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

On Thu, Jul 3, 2008 at 8:04 AM, Timo Aaltonen <tjaalton@...> wrote:

> On Thu, 3 Jul 2008, Dan Nicholson wrote:
>
>> On Thu, Jul 3, 2008 at 2:08 AM, Timo Aaltonen <tjaalton@...> wrote:
>>>
>>>       Hi!
>>>
>>>  I'm updating the Debian mesa package to use autoconf, and noticed that
>>> the
>>> handling of --libdir is broken in configure.ac. For instance;
>>>
>>> --libdir=/usr/lib/foo -> LIB_DIR=foo
>>
>> LIB_DIR has to be just the basename. It's unfortunately overloaded to
>> be the directory in the source tree where the libraries are staged,
>> and I think that needs to stay as a single level directory.
>
> Ok.
>
>>> so I've changed the sed script (with help from Martin Pitt and Steve
>>> Langasek) to 's%[[^/]*/[^/]]*/%%' (double brackets needed because of m4),
>>> so
>>> that would help the above example to set LIB_DIR=lib/foo. But, it fails
>>> to
>>> set --libdir=/foo correctly (or if you don't set it at all, it will use
>>> LIB_DIR=/usr/lib/foo which is equally wrong).
>>>
>>> So, that'll do for me for now since I can set --libdir=/usr/lib for the
>>> other flavours, but maybe you have an idea what the final script should
>>> look
>>> like?-)
>>
>> There's some unfortunate baggage from the configs/* system where the
>> directory to install to is just $(INSTALL_DIR)/$(LIB_DIR) as I'm sure
>> you've found out ($INSTALL_DIR=$prefix in configure). Let's just
>> forget about matching of --libdir arguments completely. I'll just
>> change it so that all the libraries are installed to
>> $(INSTALL_LIB_DIR). In the static configs files, it will remain
>> $(INSTALL_DIR)/$(LIB_DIR), but in configure, it will just be set to
>> ${libdir}. I might do the same with the headers since they currently
>> go to $(INSTALL_DIR)/include.
>>
>> Does that sound reasonable?
>
> I guess it does :) Thanks!
Here's a patch to try out. Could you review it a bit? I think I caught
all details, but it's a fairly invasive patch. One drawback is that
the pkgconfig directory is still set directly in the commands as
$(INSTALL_LIB_DIR)/pkgconfig. So, you'd end up with
/usr/lib/foo/pkgconfig. I could add a $(INSTALL_PC_DIR) setting if you
think you need that flexibility.

The patch is against master, but I think it should apply cleanly to
7.1rc1 if you need that.

--
Dan

RnJvbSA0MTAxOTVkYTNjZGRiMGU0ZjBhNGQzMWEyNTczMmYwMGMyNjRhZjUxIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW4gTmljaG9sc29uIDxkYm4ubGlzdHNAZ21haWwuY29tPgpE
YXRlOiBUaHUsIDMgSnVsIDIwMDggMDk6MTc6NDQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBTZXQg
bGlicmFyeSBhbmQgaGVhZGVyIGluc3RhbGxhdGlvbiBkaXJlY3RvcmllcyBmcm9tIGNvbmZpZ3Vy
YXRpb24KCkN1cnJlbnRseSB0aGUgaW5zdGFsbGF0aW9uIGRpcmVjdG9yaWVzIGZvciBsaWJyYXJp
ZXMgYW5kIGhlYWRlcnMgYXJlCnJlc29sdmVkIHdpdGhpbiB0aGUgaW5zdGFsbCBjb21tYW5kcy4g
Rm9yIGluc3RhbmNlLCB0aGUgbGlicmFyaWVzIHdpbGwKYmUgaW5zdGFsbGVkIHRvICQoSU5TVEFM
TF9ESVIpLyQoTElCX0RJUikuIFRoaXMgbGltaXRzIHRoZSBmbGV4aWJpbGl0eQpvZiB0aGUgaW5z
dGFsbGF0aW9uLCBzdWNoIGFzIHdoZW4gdGhlIGxpYnJhcmllcyBzaG91bGQgYmUgaW5zdGFsbGVk
IHRvIGEKc3ViZGlyZWN0b3J5IGxpa2UgL3Vzci9saWIvdGxzLgoKVGhpcyBhZGRzIHRoZSBtYWtl
IHZhcmlhYmxlcyAkKElOU1RBTExfTElCX0RJUikgYW5kICQoSU5TVEFMTF9JTkNfRElSKQp0byBk
ZWZpbmUgdGhlIGxvY2F0aW9ucyB0aGF0IHRoZSBsaWJyYXJpZXMgYW5kIGhlYWRlcnMgYXJlIGlu
c3RhbGxlZC4KRm9yIHRoZSBzdGF0aWMgY29uZmlncywgdGhpcyByZXNvbHZlcyBleGFjdGx5IGFz
IGJlZm9yZSB0bwokKElOU1RBTExfRElSKS9pbmNsdWRlIGFuZCAkKElOU1RBTExfRElSKS8kKExJ
Ql9ESVIpLiBGb3IgYXV0b2NvbmYsIHRoZXkKYXJlIGRlcml2ZWQgZGlyZWN0bHkgZnJvbSB0aGUg
LS1saWJkaXIgYW5kIC0taW5jbHVkZWRpciBzZXR0aW5ncy4KLS0tCiBjb25maWdzL2F1dG9jb25m
LmluICAgICAgICAgICAgfCAgICAzICsrKwogY29uZmlncy9kZWZhdWx0ICAgICAgICAgICAgICAg
IHwgICAgNCArKystCiBjb25maWd1cmUuYWMgICAgICAgICAgICAgICAgICAgfCAgICAxICsKIHNy
Yy9nbHUvTWFrZWZpbGUgICAgICAgICAgICAgICB8ICAgMTEgKysrKysrLS0tLS0KIHNyYy9nbHUv
Z2x1LnBjLmluICAgICAgICAgICAgICB8ICAgIDQgKystLQogc3JjL2dsdXQvZmJkZXYvTWFrZWZp
bGUgICAgICAgIHwgICAgOCArKysrLS0tLQogc3JjL2dsdXQvZ2x4L01ha2VmaWxlICAgICAgICAg
IHwgICAxNSArKysrKysrKy0tLS0tLS0KIHNyYy9nbHV0L2dseC9nbHV0LnBjLmluICAgICAgICB8
ICAgIDQgKystLQogc3JjL2dsdXQvbWluaS9NYWtlZmlsZSAgICAgICAgIHwgICAxNSArKysrKysr
Ky0tLS0tLS0KIHNyYy9nbHV0L21pbmkvZ2x1dC5wYy5pbiAgICAgICB8ICAgIDQgKystLQogc3Jj
L2dsdy9NYWtlZmlsZSAgICAgICAgICAgICAgIHwgICAxNSArKysrKysrKy0tLS0tLS0KIHNyYy9n
bHcvZ2x3LnBjLmluICAgICAgICAgICAgICB8ICAgIDQgKystLQogc3JjL21lc2EvTWFrZWZpbGUg
ICAgICAgICAgICAgIHwgICAxOSArKysrKysrKysrLS0tLS0tLS0tCiBzcmMvbWVzYS9kcml2ZXJz
L2RyaS9NYWtlZmlsZSAgfCAgIDE1ICsrKysrKysrKy0tLS0tLQogc3JjL21lc2EvZHJpdmVycy9k
cmkvZHJpLnBjLmluIHwgICAgNCArKy0tCiBzcmMvbWVzYS9nbC5wYy5pbiAgICAgICAgICAgICAg
fCAgICA0ICsrLS0KIDE2IGZpbGVzIGNoYW5nZWQsIDcyIGluc2VydGlvbnMoKyksIDU4IGRlbGV0
aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbmZpZ3MvYXV0b2NvbmYuaW4gYi9jb25maWdzL2F1dG9j
b25mLmluCmluZGV4IGVkNDRhMGYuLjIxZDIyNGYgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3MvYXV0b2Nv
bmYuaW4KKysrIGIvY29uZmlncy9hdXRvY29uZi5pbgpAQCAtODksOSArODksMTIgQEAgRVhQQVRf
SU5DTFVERVMgPSBARVhQQVRfSU5DTFVERVNACiBwcmVmaXggPSBAcHJlZml4QAogZXhlY19wcmVm
aXggPSBAZXhlY19wcmVmaXhACiBsaWJkaXIgPSBAbGliZGlyQAoraW5jbHVkZWRpciA9IEBpbmNs
dWRlZGlyQAogCiAjIEluc3RhbGxhdGlvbiBkaXJlY3RvcmllcyAoZm9yIG1ha2UgaW5zdGFsbCkK
IElOU1RBTExfRElSID0gJChwcmVmaXgpCitJTlNUQUxMX0xJQl9ESVIgPSAkKGxpYmRpcikKK0lO
U1RBTExfSU5DX0RJUiA9ICQoaW5jbHVkZWRpcikKIAogIyBEUkkgaW5zdGFsbGF0aW9uIGRpcmVj
dG9yaWVzCiBEUklfRFJJVkVSX0lOU1RBTExfRElSID0gQERSSV9EUklWRVJfSU5TVEFMTF9ESVJA
CmRpZmYgLS1naXQgYS9jb25maWdzL2RlZmF1bHQgYi9jb25maWdzL2RlZmF1bHQKaW5kZXggMzdi
NjkzOS4uZDViNDBjNSAxMDA2NDQKLS0tIGEvY29uZmlncy9kZWZhdWx0CisrKyBiL2NvbmZpZ3Mv
ZGVmYXVsdApAQCAtODQsNyArODQsOSBAQCBBUFBfTElCX0RFUFMgPSAtbG0KIAogIyBJbnN0YWxs
YXRpb24gZGlyZWN0b3JpZXMgKGZvciBtYWtlIGluc3RhbGwpCiBJTlNUQUxMX0RJUiA9IC91c3Iv
bG9jYWwKLURSSV9EUklWRVJfSU5TVEFMTF9ESVIgPSAkKElOU1RBTExfRElSKS8kKExJQl9ESVIp
L2RyaQorSU5TVEFMTF9MSUJfRElSID0gJChJTlNUQUxMX0RJUikvJChMSUJfRElSKQorSU5TVEFM
TF9JTkNfRElSID0gJChJTlNUQUxMX0RJUikvaW5jbHVkZQorRFJJX0RSSVZFUl9JTlNUQUxMX0RJ
UiA9ICQoSU5TVEFMTF9MSUJfRElSKS9kcmkKIAogIyBXaGVyZSBsaWJHTCB3aWxsIGxvb2sgZm9y
IERSSSBoYXJkd2FyZSBkcml2ZXJzCiBEUklfRFJJVkVSX1NFQVJDSF9ESVIgPSAkKERSSV9EUklW
RVJfSU5TVEFMTF9ESVIpCmRpZmYgLS1naXQgYS9jb25maWd1cmUuYWMgYi9jb25maWd1cmUuYWMK
aW5kZXggZjE1ZDlmZi4uOTYxYTYwYyAxMDA2NDQKLS0tIGEvY29uZmlndXJlLmFjCisrKyBiL2Nv
bmZpZ3VyZS5hYwpAQCAtOTk0LDYgKzk5NCw3IEBAIGVjaG8gIiIKIGVjaG8gIiAgICAgICAgcHJl
Zml4OiAgICAgICAgICAkcHJlZml4IgogZWNobyAiICAgICAgICBleGVjX3ByZWZpeDogICAgICRl
eGVjX3ByZWZpeCIKIGVjaG8gIiAgICAgICAgbGliZGlyOiAgICAgICAgICAkbGliZGlyIgorZWNo
byAiICAgICAgICBpbmNsdWRlZGlyOiAgICAgICRpbmNsdWRlZGlyIgogCiBkbmwgRHJpdmVyIGlu
Zm8KIGVjaG8gIiIKZGlmZiAtLWdpdCBhL3NyYy9nbHUvTWFrZWZpbGUgYi9zcmMvZ2x1L01ha2Vm
aWxlCmluZGV4IDIzMTYxYjUuLmZlMTlmZDEgMTAwNjQ0Ci0tLSBhL3NyYy9nbHUvTWFrZWZpbGUK
KysrIGIvc3JjL2dsdS9NYWtlZmlsZQpAQCAtMTYsMTYgKzE2LDE3IEBAIGRlZmF1bHQ6ICQoVE9Q
KS9jb25maWdzL2N1cnJlbnQKICMgR0xVIHBrZy1jb25maWcgZmlsZQogcGNlZGl0ID0gc2VkIFwK
IAktZSAncyxASU5TVEFMTF9ESVJALCQoSU5TVEFMTF9ESVIpLCcgXAotCS1lICdzLEBMSUJfRElS
QCwkKExJQl9ESVIpLCcgXAorCS1lICdzLEBJTlNUQUxMX0xJQl9ESVJALCQoSU5TVEFMTF9MSUJf
RElSKSwnIFwKKwktZSAncyxASU5TVEFMTF9JTkNfRElSQCwkKElOU1RBTExfSU5DX0RJUiksJyBc
CiAJLWUgJ3MsQFZFUlNJT05ALCQoTUVTQV9NQUpPUikuJChNRVNBX01JTk9SKS4kKE1FU0FfVElO
WSksJwogZ2x1LnBjOiBnbHUucGMuaW4KIAkkKHBjZWRpdCkgJDwgPiAkQAogCiBpbnN0YWxsOiBn
bHUucGMKLQkkKElOU1RBTEwpIC1kICQoREVTVERJUikkKElOU1RBTExfRElSKS8kKExJQl9ESVIp
Ci0JJChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0RJUikvJChMSUJfRElSKS9wa2dj
b25maWcKLQkkKElOU1RBTEwpICQoVE9QKS8kKExJQl9ESVIpL2xpYkdMVS4qICQoREVTVERJUikk
KElOU1RBTExfRElSKS8kKExJQl9ESVIpCi0JJChJTlNUQUxMKSAtbSA2NDQgZ2x1LnBjICQoREVT
VERJUikkKElOU1RBTExfRElSKS8kKExJQl9ESVIpL3BrZ2NvbmZpZworCSQoSU5TVEFMTCkgLWQg
JChERVNURElSKSQoSU5TVEFMTF9MSUJfRElSKQorCSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQo
SU5TVEFMTF9MSUJfRElSKS9wa2djb25maWcKKwkkKElOU1RBTEwpICQoVE9QKS8kKExJQl9ESVIp
L2xpYkdMVS4qICQoREVTVERJUikkKElOU1RBTExfTElCX0RJUikKKwkkKElOU1RBTEwpIC1tIDY0
NCBnbHUucGMgJChERVNURElSKSQoSU5TVEFMTF9MSUJfRElSKS9wa2djb25maWcKIAogY2xlYW46
CiAJLUBmb3IgZGlyIGluICQoU1VCRElSUykgOyBkbyBcCmRpZmYgLS1naXQgYS9zcmMvZ2x1L2ds
dS5wYy5pbiBiL3NyYy9nbHUvZ2x1LnBjLmluCmluZGV4IDVkNmU1MmEuLjg2MDZiOWIgMTAwNjQ0
Ci0tLSBhL3NyYy9nbHUvZ2x1LnBjLmluCisrKyBiL3NyYy9nbHUvZ2x1LnBjLmluCkBAIC0xLDcg
KzEsNyBAQAogcHJlZml4PUBJTlNUQUxMX0RJUkAKIGV4ZWNfcHJlZml4PSR7cHJlZml4fQotbGli
ZGlyPSR7ZXhlY19wcmVmaXh9L0BMSUJfRElSQAotaW5jbHVkZWRpcj0ke3ByZWZpeH0vaW5jbHVk
ZQorbGliZGlyPUBJTlNUQUxMX0xJQl9ESVJACitpbmNsdWRlZGlyPUBJTlNUQUxMX0lOQ19ESVJA
CiAKIE5hbWU6IGdsdQogRGVzY3JpcHRpb246IE1lc2EgT3BlbkdMIFV0aWxpdHkgbGlicmFyeQpk
aWZmIC0tZ2l0IGEvc3JjL2dsdXQvZmJkZXYvTWFrZWZpbGUgYi9zcmMvZ2x1dC9mYmRldi9NYWtl
ZmlsZQppbmRleCA5NTg5M2I3Li5mZjc0YTI4IDEwMDY0NAotLS0gYS9zcmMvZ2x1dC9mYmRldi9N
YWtlZmlsZQorKysgYi9zcmMvZ2x1dC9mYmRldi9NYWtlZmlsZQpAQCAtNjksMTAgKzY5LDEwIEBA
ICQoVE9QKS8kKExJQl9ESVIpLyQoR0xVVF9MSUJfTkFNRSk6IGRlcGVuZCAkKE9CSkVDVFMpCiAJ
CSQoTUtMSUJfT1BUSU9OUykgJChPQkpFQ1RTKQogCiBpbnN0YWxsOgotCSQoSU5TVEFMTCkgLWQg
JChERVNURElSKSQoSU5TVEFMTF9ESVIpL2luY2x1ZGUvR0wKLQkkKElOU1RBTEwpIC1kICQoREVT
VERJUikkKElOU1RBTExfRElSKS8kKExJQl9ESVIpCi0JJChJTlNUQUxMKSAtbSA2NDQgJChUT1Ap
L2luY2x1ZGUvR0wvZ2x1dC5oICQoREVTVERJUikkKElOU1RBTExfRElSKS9pbmNsdWRlL0dMCi0J
JChJTlNUQUxMKSAkKFRPUCkvJChMSUJfRElSKS9saWJnbHV0KiAkKERFU1RESVIpJChJTlNUQUxM
X0RJUikvJChMSUJfRElSKQorCSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQoSU5TVEFMTF9JTkNf
RElSKS9HTAorCSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQoSU5TVEFMTF9MSUJfRElSKQorCSQo
SU5TVEFMTCkgLW0gNjQ0ICQoVE9QKS9pbmNsdWRlL0dML2dsdXQuaCAkKERFU1RESVIpJChJTlNU
QUxMX0lOQ19ESVIpL0dMCisJJChJTlNUQUxMKSAkKFRPUCkvJChMSUJfRElSKS9saWJnbHV0KiAk
KERFU1RESVIpJChJTlNUQUxMX0xJQl9ESVIpCiAKICMgUnVuICdtYWtlIC1mIE1ha2VmaWxlLnNv
bG8gZGVwJyB0byB1cGRhdGUgdGhlIGRlcGVuZGVuY2llcyBpZiB5b3UgY2hhbmdlCiAjIHdoYXQn
cyBpbmNsdWRlZCBieSBhbnkgc291cmNlIGZpbGUuCmRpZmYgLS1naXQgYS9zcmMvZ2x1dC9nbHgv
TWFrZWZpbGUgYi9zcmMvZ2x1dC9nbHgvTWFrZWZpbGUKaW5kZXggNjc0ZDVhNS4uODE5ZGZkMiAx
MDA2NDQKLS0tIGEvc3JjL2dsdXQvZ2x4L01ha2VmaWxlCisrKyBiL3NyYy9nbHV0L2dseC9NYWtl
ZmlsZQpAQCAtMTAwLDE4ICsxMDAsMTkgQEAgJChUT1ApLyQoTElCX0RJUikvJChHTFVUX0xJQl9O
QU1FKTogZGVwZW5kICQoT0JKRUNUUykKICMgZ2x1dCBwa2djb25maWcgZmlsZQogcGNlZGl0ID0g
c2VkIFwKIAktZSAncyxASU5TVEFMTF9ESVJALCQoSU5TVEFMTF9ESVIpLCcgXAotCS1lICdzLEBM
SUJfRElSQCwkKExJQl9ESVIpLCcgXAorCS1lICdzLEBJTlNUQUxMX0xJQl9ESVJALCQoSU5TVEFM
TF9MSUJfRElSKSwnIFwKKwktZSAncyxASU5TVEFMTF9JTkNfRElSQCwkKElOU1RBTExfSU5DX0RJ
UiksJyBcCiAJLWUgJ3MsQFZFUlNJT05ALCQoR0xVVF9NQUpPUikuJChHTFVUX01JTk9SKS4kKEdM
VVRfVElOWSksJwogZ2x1dC5wYzogZ2x1dC5wYy5pbgogCSQocGNlZGl0KSAkPCA+ICRACiAKIGlu
c3RhbGw6IGdsdXQucGMKLQkkKElOU1RBTEwpIC1kICQoREVTVERJUikkKElOU1RBTExfRElSKS9p
bmNsdWRlL0dMCi0JJChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0RJUikvJChMSUJf
RElSKQotCSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQoSU5TVEFMTF9ESVIpLyQoTElCX0RJUikv
cGtnY29uZmlnCi0JJChJTlNUQUxMKSAtbSA2NDQgJChUT1ApL2luY2x1ZGUvR0wvZ2x1dC5oICQo
REVTVERJUikkKElOU1RBTExfRElSKS9pbmNsdWRlL0dMCi0JJChJTlNUQUxMKSAkKFRPUCkvJChM
SUJfRElSKS9saWJnbHV0KiAkKERFU1RESVIpJChJTlNUQUxMX0RJUikvJChMSUJfRElSKQotCSQo
SU5TVEFMTCkgLW0gNjQ0IGdsdXQucGMgJChERVNURElSKSQoSU5TVEFMTF9ESVIpLyQoTElCX0RJ
UikvcGtnY29uZmlnCisJJChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0lOQ19ESVIp
L0dMCisJJChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0xJQl9ESVIpCisJJChJTlNU
QUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0xJQl9ESVIpL3BrZ2NvbmZpZworCSQoSU5TVEFM
TCkgLW0gNjQ0ICQoVE9QKS9pbmNsdWRlL0dML2dsdXQuaCAkKERFU1RESVIpJChJTlNUQUxMX0lO
Q19ESVIpL0dMCisJJChJTlNUQUxMKSAkKFRPUCkvJChMSUJfRElSKS9saWJnbHV0KiAkKERFU1RE
SVIpJChJTlNUQUxMX0xJQl9ESVIpCisJJChJTlNUQUxMKSAtbSA2NDQgZ2x1dC5wYyAkKERFU1RE
SVIpJChJTlNUQUxMX0xJQl9ESVIpL3BrZ2NvbmZpZwogCiAKIGNsZWFuOgpkaWZmIC0tZ2l0IGEv
c3JjL2dsdXQvZ2x4L2dsdXQucGMuaW4gYi9zcmMvZ2x1dC9nbHgvZ2x1dC5wYy5pbgppbmRleCBm
NzMyZjI5Li5lODYzOGZlIDEwMDY0NAotLS0gYS9zcmMvZ2x1dC9nbHgvZ2x1dC5wYy5pbgorKysg
Yi9zcmMvZ2x1dC9nbHgvZ2x1dC5wYy5pbgpAQCAtMSw3ICsxLDcgQEAKIHByZWZpeD1ASU5TVEFM
TF9ESVJACiBleGVjX3ByZWZpeD0ke3ByZWZpeH0KLWxpYmRpcj0ke2V4ZWNfcHJlZml4fS9ATElC
X0RJUkAKLWluY2x1ZGVkaXI9JHtwcmVmaXh9L2luY2x1ZGUKK2xpYmRpcj1ASU5TVEFMTF9MSUJf
RElSQAoraW5jbHVkZWRpcj1ASU5TVEFMTF9JTkNfRElSQAogCiBOYW1lOiBnbHV0CiBEZXNjcmlw
dGlvbjogTWVzYSBPcGVuR0wgVXRpbGl0eSBUb29sa2l0IGxpYnJhcnkKZGlmZiAtLWdpdCBhL3Ny
Yy9nbHV0L21pbmkvTWFrZWZpbGUgYi9zcmMvZ2x1dC9taW5pL01ha2VmaWxlCmluZGV4IGQzODYw
NTAuLjZhYmEyYWYgMTAwNjQ0Ci0tLSBhL3NyYy9nbHV0L21pbmkvTWFrZWZpbGUKKysrIGIvc3Jj
L2dsdXQvbWluaS9NYWtlZmlsZQpAQCAtNzUsMTggKzc1LDE5IEBAIHRhZ3M6CiAjIGdsdXQgcGtn
Y29uZmlnIGZpbGUKIHBjZWRpdCA9IHNlZCBcCiAJLWUgJ3MsQElOU1RBTExfRElSQCwkKElOU1RB
TExfRElSKSwnIFwKLQktZSAncyxATElCX0RJUkAsJChMSUJfRElSKSwnIFwKKwktZSAncyxASU5T
VEFMTF9MSUJfRElSQCwkKElOU1RBTExfTElCX0RJUiksJyBcCisJLWUgJ3MsQElOU1RBTExfSU5D
X0RJUkAsJChJTlNUQUxMX0lOQ19ESVIpLCcgXAogCS1lICdzLEBWRVJTSU9OQCwkKEdMVVRfTUFK
T1IpLiQoR0xVVF9NSU5PUikuJChHTFVUX1RJTlkpLCcKIGdsdXQucGM6IGdsdXQucGMuaW4KIAkk
KHBjZWRpdCkgJDwgPiAkQAogCiBpbnN0YWxsOiBnbHV0LnBjCi0JJChJTlNUQUxMKSAtZCAkKERF
U1RESVIpJChJTlNUQUxMX0RJUikvaW5jbHVkZS9HTAotCSQoSU5TVEFMTCkgLWQgJChERVNURElS
KSQoSU5TVEFMTF9ESVIpLyQoTElCX0RJUikKLQkkKElOU1RBTEwpIC1kICQoREVTVERJUikkKElO
U1RBTExfRElSKS8kKExJQl9ESVIpL3BrZ2NvbmZpZwotCSQoSU5TVEFMTCkgLW0gNjQ0ICQoVE9Q
KS9pbmNsdWRlL0dML2dsdXQuaCAkKERFU1RESVIpJChJTlNUQUxMX0RJUikvaW5jbHVkZS9HTAot
CSQoSU5TVEFMTCkgJChUT1ApLyQoTElCX0RJUikvbGliZ2x1dCogJChERVNURElSKSQoSU5TVEFM
TF9ESVIpLyQoTElCX0RJUikKLQkkKElOU1RBTEwpIC1tIDY0NCBnbHV0LnBjICQoREVTVERJUikk
KElOU1RBTExfRElSKS8kKExJQl9ESVIpL3BrZ2NvbmZpZworCSQoSU5TVEFMTCkgLWQgJChERVNU
RElSKSQoSU5TVEFMTF9JTkNfRElSKS9HTAorCSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQoSU5T
VEFMTF9MSUJfRElSKQorCSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQoSU5TVEFMTF9MSUJfRElS
KS9wa2djb25maWcKKwkkKElOU1RBTEwpIC1tIDY0NCAkKFRPUCkvaW5jbHVkZS9HTC9nbHV0Lmgg
JChERVNURElSKSQoSU5TVEFMTF9JTkNfRElSKS9HTAorCSQoSU5TVEFMTCkgJChUT1ApLyQoTElC
X0RJUikvbGliZ2x1dCogJChERVNURElSKSQoSU5TVEFMTF9MSUJfRElSKQorCSQoSU5TVEFMTCkg
LW0gNjQ0IGdsdXQucGMgJChERVNURElSKSQoSU5TVEFMTF9MSUJfRElSKS9wa2djb25maWcKIAog
CiAjIFJlbW92ZSAubyBhbmQgYmFja3VwIGZpbGVzCmRpZmYgLS1naXQgYS9zcmMvZ2x1dC9taW5p
L2dsdXQucGMuaW4gYi9zcmMvZ2x1dC9taW5pL2dsdXQucGMuaW4KaW5kZXggZjczMmYyOS4uZTg2
MzhmZSAxMDA2NDQKLS0tIGEvc3JjL2dsdXQvbWluaS9nbHV0LnBjLmluCisrKyBiL3NyYy9nbHV0
L21pbmkvZ2x1dC5wYy5pbgpAQCAtMSw3ICsxLDcgQEAKIHByZWZpeD1ASU5TVEFMTF9ESVJACiBl
eGVjX3ByZWZpeD0ke3ByZWZpeH0KLWxpYmRpcj0ke2V4ZWNfcHJlZml4fS9ATElCX0RJUkAKLWlu
Y2x1ZGVkaXI9JHtwcmVmaXh9L2luY2x1ZGUKK2xpYmRpcj1ASU5TVEFMTF9MSUJfRElSQAoraW5j
bHVkZWRpcj1ASU5TVEFMTF9JTkNfRElSQAogCiBOYW1lOiBnbHV0CiBEZXNjcmlwdGlvbjogTWVz
YSBPcGVuR0wgVXRpbGl0eSBUb29sa2l0IGxpYnJhcnkKZGlmZiAtLWdpdCBhL3NyYy9nbHcvTWFr
ZWZpbGUgYi9zcmMvZ2x3L01ha2VmaWxlCmluZGV4IDg4YmY5OWQuLmYwZGQxYWMgMTAwNjQ0Ci0t
LSBhL3NyYy9nbHcvTWFrZWZpbGUKKysrIGIvc3JjL2dsdy9NYWtlZmlsZQpAQCAtMjgsMTggKzI4
LDE5IEBAIGRlZmF1bHQ6ICQoVE9QKS8kKExJQl9ESVIpLyQoR0xXX0xJQl9OQU1FKQogIyBHTFUg
cGtnLWNvbmZpZyBmaWxlCiBwY2VkaXQgPSBzZWQgXAogCS1lICdzLEBJTlNUQUxMX0RJUkAsJChJ
TlNUQUxMX0RJUiksJyBcCi0JLWUgJ3MsQExJQl9ESVJALCQoTElCX0RJUiksJyBcCisJLWUgJ3Ms
QElOU1RBTExfTElCX0RJUkAsJChJTlNUQUxMX0xJQl9ESVIpLCcgXAorCS1lICdzLEBJTlNUQUxM
X0lOQ19ESVJALCQoSU5TVEFMTF9JTkNfRElSKSwnIFwKIAktZSAncyxAVkVSU0lPTkAsJChNQUpP
UikuJChNSU5PUikuJChUSU5ZKSwnCiBnbHcucGM6IGdsdy5wYy5pbgogCSQocGNlZGl0KSAkPCA+
ICRACiAKIGluc3RhbGw6IGdsdy5wYwotCSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQoSU5TVEFM
TF9ESVIpL2luY2x1ZGUvR0wKLQkkKElOU1RBTEwpIC1kICQoREVTVERJUikkKElOU1RBTExfRElS
KS8kKExJQl9ESVIpCi0JJChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0RJUikvJChM
SUJfRElSKS9wa2djb25maWcKLQkkKElOU1RBTEwpIC1tIDY0NCAqLmggJChERVNURElSKSQoSU5T
VEFMTF9ESVIpL2luY2x1ZGUvR0wKLQkkKElOU1RBTEwpICQoVE9QKS8kKExJQl9ESVIpL2xpYkdM
dy4qICQoREVTVERJUikkKElOU1RBTExfRElSKS8kKExJQl9ESVIpCi0JJChJTlNUQUxMKSAtbSA2
NDQgZ2x3LnBjICQoREVTVERJUikkKElOU1RBTExfRElSKS8kKExJQl9ESVIpL3BrZ2NvbmZpZwor
CSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQoSU5TVEFMTF9JTkNfRElSKS9HTAorCSQoSU5TVEFM
TCkgLWQgJChERVNURElSKSQoSU5TVEFMTF9MSUJfRElSKQorCSQoSU5TVEFMTCkgLWQgJChERVNU
RElSKSQoSU5TVEFMTF9MSUJfRElSKS9wa2djb25maWcKKwkkKElOU1RBTEwpIC1tIDY0NCAqLmgg
JChERVNURElSKSQoSU5TVEFMTF9JTkNfRElSKS9HTAorCSQoSU5TVEFMTCkgJChUT1ApLyQoTElC
X0RJUikvbGliR0x3LiogJChERVNURElSKSQoSU5TVEFMTF9MSUJfRElSKQorCSQoSU5TVEFMTCkg
LW0gNjQ0IGdsdy5wYyAkKERFU1RESVIpJChJTlNUQUxMX0xJQl9ESVIpL3BrZ2NvbmZpZwogCiBj
bGVhbjoKIAktcm0gLWYgZGVwZW5kIGRlcGVuZC5iYWsKZGlmZiAtLWdpdCBhL3NyYy9nbHcvZ2x3
LnBjLmluIGIvc3JjL2dsdy9nbHcucGMuaW4KaW5kZXggOWMyNjgyZi4uMjVmM2Y3MyAxMDA2NDQK
LS0tIGEvc3JjL2dsdy9nbHcucGMuaW4KKysrIGIvc3JjL2dsdy9nbHcucGMuaW4KQEAgLTEsNyAr
MSw3IEBACiBwcmVmaXg9QElOU1RBTExfRElSQAogZXhlY19wcmVmaXg9JHtwcmVmaXh9Ci1saWJk
aXI9JHtleGVjX3ByZWZpeH0vQExJQl9ESVJACi1pbmNsdWRlZGlyPSR7cHJlZml4fS9pbmNsdWRl
CitsaWJkaXI9QElOU1RBTExfTElCX0RJUkAKK2luY2x1ZGVkaXI9QElOU1RBTExfSU5DX0RJUkAK
IAogTmFtZTogZ2x3CiBEZXNjcmlwdGlvbjogTWVzYSBPcGVuR0wgd2lkZ2V0IGxpYnJhcnkKZGlm
ZiAtLWdpdCBhL3NyYy9tZXNhL01ha2VmaWxlIGIvc3JjL21lc2EvTWFrZWZpbGUKaW5kZXggZTBi
NjQxYi4uMzgyN2ZmYiAxMDA2NDQKLS0tIGEvc3JjL21lc2EvTWFrZWZpbGUKKysrIGIvc3JjL21l
c2EvTWFrZWZpbGUKQEAgLTkwLDI4ICs5MCwyOSBAQCBpbnN0YWxsOiBkZWZhdWx0CiAKIHBjZWRp
dCA9IHNlZCBcCiAJLWUgJ3MsQElOU1RBTExfRElSQCwkKElOU1RBTExfRElSKSwnIFwKLQktZSAn
cyxATElCX0RJUkAsJChMSUJfRElSKSwnIFwKKwktZSAncyxASU5TVEFMTF9MSUJfRElSQCwkKElO
U1RBTExfTElCX0RJUiksJyBcCisJLWUgJ3MsQElOU1RBTExfSU5DX0RJUkAsJChJTlNUQUxMX0lO
Q19ESVIpLCcgXAogCS1lICdzLEBWRVJTSU9OQCwkKE1FU0FfTUFKT1IpLiQoTUVTQV9NSU5PUiku
JChNRVNBX1RJTlkpLCcKIAogZ2wucGM6IGdsLnBjLmluCiAJJChwY2VkaXQpICQ8ID4gJEAKIAog
aW5zdGFsbC1oZWFkZXJzOgotCSQoSU5TVEFMTCkgLWQgJChERVNURElSKSQoSU5TVEFMTF9ESVIp
L2luY2x1ZGUvR0wKKwkkKElOU1RBTEwpIC1kICQoREVTVERJUikkKElOU1RBTExfSU5DX0RJUikv
R0wKIAkkKElOU1RBTEwpIC1tIDY0NCAkKFRPUCkvaW5jbHVkZS9HTC8qLmggXAotCQkkKERFU1RE
SVIpJChJTlNUQUxMX0RJUikvaW5jbHVkZS9HTAorCQkkKERFU1RESVIpJChJTlNUQUxMX0lOQ19E
SVIpL0dMCiAKIGluc3RhbGwtbGliZ2w6IGRlZmF1bHQgZ2wucGMgaW5zdGFsbC1oZWFkZXJzCi0J
JChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0RJUikvJChMSUJfRElSKQotCSQoSU5T
VEFMTCkgLWQgJChERVNURElSKSQoSU5TVEFMTF9ESVIpLyQoTElCX0RJUikvcGtnY29uZmlnCisJ
JChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0xJQl9ESVIpCisJJChJTlNUQUxMKSAt
ZCAkKERFU1RESVIpJChJTlNUQUxMX0xJQl9ESVIpL3BrZ2NvbmZpZwogCSQoSU5TVEFMTCkgJChU
T1ApLyQoTElCX0RJUikvJChHTF9MSUJfTkFNRSkqIFwKLQkJJChERVNURElSKSQoSU5TVEFMTF9E
SVIpLyQoTElCX0RJUikKLQkkKElOU1RBTEwpIC1tIDY0NCBnbC5wYyAkKERFU1RESVIpJChJTlNU
QUxMX0RJUikvJChMSUJfRElSKS9wa2djb25maWcKKwkJJChERVNURElSKSQoSU5TVEFMTF9MSUJf
RElSKQorCSQoSU5TVEFMTCkgLW0gNjQ0IGdsLnBjICQoREVTVERJUikkKElOU1RBTExfTElCX0RJ
UikvcGtnY29uZmlnCiAKIGluc3RhbGwtb3NtZXNhOiBkZWZhdWx0Ci0JJChJTlNUQUxMKSAtZCAk
KERFU1RESVIpJChJTlNUQUxMX0RJUikvJChMSUJfRElSKQorCSQoSU5TVEFMTCkgLWQgJChERVNU
RElSKSQoSU5TVEFMTF9MSUJfRElSKQogCSQoSU5TVEFMTCkgJChUT1ApLyQoTElCX0RJUikvJChP
U01FU0FfTElCX05BTUUpKiBcCi0JCSQoREVTVERJUikkKElOU1RBTExfRElSKS8kKExJQl9ESVIp
CisJCSQoREVTVERJUikkKElOU1RBTExfTElCX0RJUikKIAogaW5zdGFsbC1kcmk6IGRlZmF1bHQK
IAljZCBkcml2ZXJzL2RyaSAmJiAkKE1BS0UpIGluc3RhbGwKZGlmZiAtLWdpdCBhL3NyYy9tZXNh
L2RyaXZlcnMvZHJpL01ha2VmaWxlIGIvc3JjL21lc2EvZHJpdmVycy9kcmkvTWFrZWZpbGUKaW5k
ZXggM2Y4Nzc4Mi4uOTYxMThlMCAxMDA2NDQKLS0tIGEvc3JjL21lc2EvZHJpdmVycy9kcmkvTWFr
ZWZpbGUKKysrIGIvc3JjL21lc2EvZHJpdmVycy9kcmkvTWFrZWZpbGUKQEAgLTIyLDcgKzIyLDgg
QEAgc3ViZGlyczoKIAogcGNlZGl0ID0gc2VkIFwKIAktZSAncyxASU5TVEFMTF9ESVJALCQoSU5T
VEFMTF9ESVIpLCcgXAotCS1lICdzLEBMSUJfRElSQCwkKExJQl9ESVIpLCcgXAorCS1lICdzLEBJ
TlNUQUxMX0xJQl9ESVJALCQoSU5TVEFMTF9MSUJfRElSKSwnIFwKKwktZSAncyxASU5TVEFMTF9J
TkNfRElSQCwkKElOU1RBTExfSU5DX0RJUiksJyBcCiAJLWUgJ3MsQFZFUlNJT05ALCQoTUVTQV9N
QUpPUikuJChNRVNBX01JTk9SKS4kKE1FU0FfVElOWSksJyBcCiAJLWUgJ3MsQERSSV9EUklWRVJf
RElSQCwkKERSSV9EUklWRVJfU0VBUkNIX0RJUiksJwogCkBAIC0zNiwxMSArMzcsMTMgQEAgaW5z
dGFsbDogZHJpLnBjCiAJCQkoY2QgJCRkaXIgJiYgJChNQUtFKSBpbnN0YWxsKSB8fCBleGl0IDEg
OyBcCiAJCWZpIFwKIAlkb25lCi0JJChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChJTlNUQUxMX0RJ
UikvaW5jbHVkZS9HTC9pbnRlcm5hbAotCSQoSU5TVEFMTCkgLW0gMDY0NCAkKFRPUCkvaW5jbHVk
ZS9HTC9pbnRlcm5hbC9kcmlfaW50ZXJmYWNlLmggJChERVNURElSKSQoSU5TVEFMTF9ESVIpL2lu
Y2x1ZGUvR0wvaW50ZXJuYWwKLQkkKElOU1RBTEwpIC1tIDA2NDQgJChUT1ApL2luY2x1ZGUvR0wv
aW50ZXJuYWwvZHJpX3NhcmVhLmggJChERVNURElSKSQoSU5TVEFMTF9ESVIpL2luY2x1ZGUvR0wv
aW50ZXJuYWwKLQkkKElOU1RBTEwpIC1kICQoREVTVERJUikkKElOU1RBTExfRElSKS8kKExJQl9E
SVIpL3BrZ2NvbmZpZwotCSQoSU5TVEFMTCkgLW0gMDY0NCBkcmkucGMgJChERVNURElSKSQoSU5T
VEFMTF9ESVIpLyQoTElCX0RJUikvcGtnY29uZmlnCisJJChJTlNUQUxMKSAtZCAkKERFU1RESVIp
JChJTlNUQUxMX0lOQ19ESVIpL0dML2ludGVybmFsCisJJChJTlNUQUxMKSAtbSAwNjQ0ICQoVE9Q
KS9pbmNsdWRlL0dML2ludGVybmFsL2RyaV9pbnRlcmZhY2UuaCBcCisJICAkKERFU1RESVIpJChJ
TlNUQUxMX0lOQ19ESVIpL0dML2ludGVybmFsCisJJChJTlNUQUxMKSAtbSAwNjQ0ICQoVE9QKS9p
bmNsdWRlL0dML2ludGVybmFsL2RyaV9zYXJlYS5oIFwKKwkgICQoREVTVERJUikkKElOU1RBTExf
SU5DX0RJUikvR0wvaW50ZXJuYWwKKwkkKElOU1RBTEwpIC1kICQoREVTVERJUikkKElOU1RBTExf
TElCX0RJUikvcGtnY29uZmlnCisJJChJTlNUQUxMKSAtbSAwNjQ0IGRyaS5wYyAkKERFU1RESVIp
JChJTlNUQUxMX0xJQl9ESVIpL3BrZ2NvbmZpZwogCiAKIGNsZWFuOgpkaWZmIC0tZ2l0IGEvc3Jj
L21lc2EvZHJpdmVycy9kcmkvZHJpLnBjLmluIGIvc3JjL21lc2EvZHJpdmVycy9kcmkvZHJpLnBj
LmluCmluZGV4IDU4ZDg5MGQuLmM0N2VlOWMgMTAwNjQ0Ci0tLSBhL3NyYy9tZXNhL2RyaXZlcnMv
ZHJpL2RyaS5wYy5pbgorKysgYi9zcmMvbWVzYS9kcml2ZXJzL2RyaS9kcmkucGMuaW4KQEAgLTEs
NyArMSw3IEBACiBwcmVmaXg9QElOU1RBTExfRElSQAogZXhlY19wcmVmaXg9JHtwcmVmaXh9Ci1s
aWJkaXI9JHtleGVjX3ByZWZpeH0vQExJQl9ESVJACi1pbmNsdWRlZGlyPSR7cHJlZml4fS9pbmNs
dWRlCitsaWJkaXI9QElOU1RBTExfTElCX0RJUkAKK2luY2x1ZGVkaXI9QElOU1RBTExfSU5DX0RJ
UkAKIGRyaWRyaXZlcmRpcj1ARFJJX0RSSVZFUl9ESVJACiAKIE5hbWU6IGRyaQpkaWZmIC0tZ2l0
IGEvc3JjL21lc2EvZ2wucGMuaW4gYi9zcmMvbWVzYS9nbC5wYy5pbgppbmRleCA0YjE0NGZmLi4x
OTI3ODgwIDEwMDY0NAotLS0gYS9zcmMvbWVzYS9nbC5wYy5pbgorKysgYi9zcmMvbWVzYS9nbC5w
Yy5pbgpAQCAtMSw3ICsxLDcgQEAKIHByZWZpeD1ASU5TVEFMTF9ESVJACiBleGVjX3ByZWZpeD0k
e3ByZWZpeH0KLWxpYmRpcj0ke2V4ZWNfcHJlZml4fS9ATElCX0RJUkAKLWluY2x1ZGVkaXI9JHtw
cmVmaXh9L2luY2x1ZGUKK2xpYmRpcj1ASU5TVEFMTF9MSUJfRElSQAoraW5jbHVkZWRpcj1ASU5T
VEFMTF9JTkNfRElSQAogCiBOYW1lOiBnbAogRGVzY3JpcHRpb246IE1lc2EgT3BlbkdMIGxpYnJh
cnkKLS0gCjEuNS4zLjIKCg==
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@...
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev

Re: bug in mesa configure.ac?

by Timo Aaltonen :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

On Thu, 3 Jul 2008, Dan Nicholson wrote:

> Here's a patch to try out. Could you review it a bit? I think I caught
> all details, but it's a fairly invasive patch. One drawback is that
> the pkgconfig directory is still set directly in the commands as
> $(INSTALL_LIB_DIR)/pkgconfig. So, you'd end up with
> /usr/lib/foo/pkgconfig. I could add a $(INSTALL_PC_DIR) setting if you
> think you need that flexibility.
>
> The patch is against master, but I think it should apply cleanly to
> 7.1rc1 if you need that.

Hmm, my email client(s) (alpine, thunderbird) don't like the attachment..
is it corrupted or something?

t

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@...
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev

Re: bug in mesa configure.ac?

by Dan Nicholson-2 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

On Fri, Jul 04, 2008 at 02:09:09AM +0300, Timo Aaltonen wrote:

> On Thu, 3 Jul 2008, Dan Nicholson wrote:
>
>> Here's a patch to try out. Could you review it a bit? I think I caught
>> all details, but it's a fairly invasive patch. One drawback is that
>> the pkgconfig directory is still set directly in the commands as
>> $(INSTALL_LIB_DIR)/pkgconfig. So, you'd end up with
>> /usr/lib/foo/pkgconfig. I could add a $(INSTALL_PC_DIR) setting if you
>> think you need that flexibility.
>>
>> The patch is against master, but I think it should apply cleanly to
>> 7.1rc1 if you need that.
>
> Hmm, my email client(s) (alpine, thunderbird) don't like the attachment..
> is it corrupted or something?

Huh. Well, it looked alright when it left, but the archives show it all
messed up. Trying again inline.

---

>From 410195da3cddb0e4f0a4d31a25732f00c264af51 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@...>
Date: Thu, 3 Jul 2008 09:17:44 -0700
Subject: [PATCH] Set library and header installation directories from configuration

Currently the installation directories for libraries and headers are
resolved within the install commands. For instance, the libraries will
be installed to $(INSTALL_DIR)/$(LIB_DIR). This limits the flexibility
of the installation, such as when the libraries should be installed to a
subdirectory like /usr/lib/tls.

This adds the make variables $(INSTALL_LIB_DIR) and $(INSTALL_INC_DIR)
to define the locations that the libraries and headers are installed.
For the static configs, this resolves exactly as before to
$(INSTALL_DIR)/include and $(INSTALL_DIR)/$(LIB_DIR). For autoconf, they
are derived directly from the --libdir and --includedir settings.
---
 configs/autoconf.in            |    3 +++
 configs/default                |    4 +++-
 configure.ac                   |    1 +
 src/glu/Makefile               |   11 ++++++-----
 src/glu/glu.pc.in              |    4 ++--
 src/glut/fbdev/Makefile        |    8 ++++----
 src/glut/glx/Makefile          |   15 ++++++++-------
 src/glut/glx/glut.pc.in        |    4 ++--
 src/glut/mini/Makefile         |   15 ++++++++-------
 src/glut/mini/glut.pc.in       |    4 ++--
 src/glw/Makefile               |   15 ++++++++-------
 src/glw/glw.pc.in              |    4 ++--
 src/mesa/Makefile              |   19 ++++++++++---------
 src/mesa/drivers/dri/Makefile  |   15 +++++++++------
 src/mesa/drivers/dri/dri.pc.in |    4 ++--
 src/mesa/gl.pc.in              |    4 ++--
 16 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/configs/autoconf.in b/configs/autoconf.in
index ed44a0f..21d224f 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -89,9 +89,12 @@ EXPAT_INCLUDES = @EXPAT_INCLUDES@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
+includedir = @includedir@
 
 # Installation directories (for make install)
 INSTALL_DIR = $(prefix)
+INSTALL_LIB_DIR = $(libdir)
+INSTALL_INC_DIR = $(includedir)
 
 # DRI installation directories
 DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
diff --git a/configs/default b/configs/default
index 37b6939..d5b40c5 100644
--- a/configs/default
+++ b/configs/default
@@ -84,7 +84,9 @@ APP_LIB_DEPS = -lm
 
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/$(LIB_DIR)/dri
+INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
+INSTALL_INC_DIR = $(INSTALL_DIR)/include
+DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
 
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
diff --git a/configure.ac b/configure.ac
index f15d9ff..961a60c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -994,6 +994,7 @@ echo ""
 echo "        prefix:          $prefix"
 echo "        exec_prefix:     $exec_prefix"
 echo "        libdir:          $libdir"
+echo "        includedir:      $includedir"
 
 dnl Driver info
 echo ""
diff --git a/src/glu/Makefile b/src/glu/Makefile
index 23161b5..fe19fd1 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -16,16 +16,17 @@ default: $(TOP)/configs/current
 # 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)/libGLU.* $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 clean:
  -@for dir in $(SUBDIRS) ; do \
diff --git a/src/glu/glu.pc.in b/src/glu/glu.pc.in
index 5d6e52a..8606b9b 100644
--- a/src/glu/glu.pc.in
+++ b/src/glu/glu.pc.in
@@ -1,7 +1,7 @@
 prefix=@INSTALL_DIR@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
+libdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
 
 Name: glu
 Description: Mesa OpenGL Utility library
diff --git a/src/glut/fbdev/Makefile b/src/glut/fbdev/Makefile
index 95893b7..ff74a28 100644
--- a/src/glut/fbdev/Makefile
+++ b/src/glut/fbdev/Makefile
@@ -69,10 +69,10 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
  $(MKLIB_OPTIONS) $(OBJECTS)
 
 install:
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_LIB_DIR)
 
 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 674d5a5..819dfd2 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -100,18 +100,19 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
 # glut pkgconfig 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@,$(GLUT_MAJOR).$(GLUT_MINOR).$(GLUT_TINY),'
 glut.pc: glut.pc.in
  $(pcedit) $< > $@
 
 install: glut.pc
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
- $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -m 644 glut.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -m 644 glut.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 
 clean:
diff --git a/src/glut/glx/glut.pc.in b/src/glut/glx/glut.pc.in
index f732f29..e8638fe 100644
--- a/src/glut/glx/glut.pc.in
+++ b/src/glut/glx/glut.pc.in
@@ -1,7 +1,7 @@
 prefix=@INSTALL_DIR@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
+libdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
 
 Name: glut
 Description: Mesa OpenGL Utility Toolkit library
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index d386050..6aba2af 100644
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -75,18 +75,19 @@ tags:
 # glut pkgconfig 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@,$(GLUT_MAJOR).$(GLUT_MINOR).$(GLUT_TINY),'
 glut.pc: glut.pc.in
  $(pcedit) $< > $@
 
 install: glut.pc
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
- $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -m 644 glut.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -m 644 glut.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 
 # Remove .o and backup files
diff --git a/src/glut/mini/glut.pc.in b/src/glut/mini/glut.pc.in
index f732f29..e8638fe 100644
--- a/src/glut/mini/glut.pc.in
+++ b/src/glut/mini/glut.pc.in
@@ -1,7 +1,7 @@
 prefix=@INSTALL_DIR@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
+libdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
 
 Name: glut
 Description: Mesa OpenGL Utility Toolkit library
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 88bf99d..f0dd1ac 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -28,18 +28,19 @@ default: $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME)
 # 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@,$(MAJOR).$(MINOR).$(TINY),'
 glw.pc: glw.pc.in
  $(pcedit) $< > $@
 
 install: glw.pc
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
- $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 clean:
  -rm -f depend depend.bak
diff --git a/src/glw/glw.pc.in b/src/glw/glw.pc.in
index 9c2682f..25f3f73 100644
--- a/src/glw/glw.pc.in
+++ b/src/glw/glw.pc.in
@@ -1,7 +1,7 @@
 prefix=@INSTALL_DIR@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
+libdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
 
 Name: glw
 Description: Mesa OpenGL widget library
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index e0b641b..3827ffb 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -90,28 +90,29 @@ install: default
 
 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),'
 
 gl.pc: gl.pc.in
  $(pcedit) $< > $@
 
 install-headers:
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
  $(INSTALL) -m 644 $(TOP)/include/GL/*.h \
- $(DESTDIR)$(INSTALL_DIR)/include/GL
+ $(DESTDIR)$(INSTALL_INC_DIR)/GL
 
 install-libgl: default gl.pc install-headers
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
  $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)* \
- $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+ $(DESTDIR)$(INSTALL_LIB_DIR)
+ $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 install-osmesa: default
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
  $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)* \
- $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
+ $(DESTDIR)$(INSTALL_LIB_DIR)
 
 install-dri: default
  cd drivers/dri && $(MAKE) install
diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile
index 3f87782..96118e0 100644
--- a/src/mesa/drivers/dri/Makefile
+++ b/src/mesa/drivers/dri/Makefile
@@ -22,7 +22,8 @@ subdirs:
 
 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),' \
  -e 's,@DRI_DRIVER_DIR@,$(DRI_DRIVER_SEARCH_DIR),'
 
@@ -36,11 +37,13 @@ install: dri.pc
  (cd $$dir && $(MAKE) install) || exit 1 ; \
  fi \
  done
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
- $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+ $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
+  $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+ $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_sarea.h \
+  $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 
 clean:
diff --git a/src/mesa/drivers/dri/dri.pc.in b/src/mesa/drivers/dri/dri.pc.in
index 58d890d..c47ee9c 100644
--- a/src/mesa/drivers/dri/dri.pc.in
+++ b/src/mesa/drivers/dri/dri.pc.in
@@ -1,7 +1,7 @@
 prefix=@INSTALL_DIR@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
+libdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
 dridriverdir=@DRI_DRIVER_DIR@
 
 Name: dri
diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
index 4b144ff..1927880 100644
--- a/src/mesa/gl.pc.in
+++ b/src/mesa/gl.pc.in
@@ -1,7 +1,7 @@
 prefix=@INSTALL_DIR@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
+libdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
 
 Name: gl
 Description: Mesa OpenGL library
--
1.5.3.2

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@...
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev

Re: bug in mesa configure.ac?

by Timo Aaltonen :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

On Thu, 3 Jul 2008, Dan Nicholson wrote:

> On Fri, Jul 04, 2008 at 02:09:09AM +0300, Timo Aaltonen wrote:
>> On Thu, 3 Jul 2008, Dan Nicholson wrote:
>>
>>> Here's a patch to try out. Could you review it a bit? I think I caught
>>> all details, but it's a fairly invasive patch. One drawback is that
>>> the pkgconfig directory is still set directly in the commands as
>>> $(INSTALL_LIB_DIR)/pkgconfig. So, you'd end up with
>>> /usr/lib/foo/pkgconfig. I could add a $(INSTALL_PC_DIR) setting if you
>>> think you need that flexibility.
>>>
>>> The patch is against master, but I think it should apply cleanly to
>>> 7.1rc1 if you need that.
>>
>> Hmm, my email client(s) (alpine, thunderbird) don't like the attachment..
>> is it corrupted or something?
>
> Huh. Well, it looked alright when it left, but the archives show it all
> messed up. Trying again inline.

Looks like that patch did the trick, the build & packaging went fine
without adding any extra --libdir's or other tricks :)

thanks!

t

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@...
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
LightInTheBox - Buy quality products at wholesale price