|
Check-in Number:
|
5160 | |
| Date: |
2005-Sep-02 16:40:13 (local)
2005-Sep-02 14:40:13 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
fix DESTDIR passing and usage in PHP part |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/uuid/Makefile.in 1.34 -> 1.35
--- Makefile.in 2005/09/02 14:36:41 1.34
+++ Makefile.in 2005/09/02 14:40:13 1.35
@@ -238,10 +238,10 @@
@$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
$(SHTOOL) install -c -m 644 $(srcdir)/uuid.1 $(DESTDIR)$(mandir)/man1/
-@if [ ".$(WITH_PERL)" = .yes ]; then \
- (cd perl && $(MAKE) $(MFLAGS) install); \
+ (cd perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
fi
-@if [ ".$(WITH_PHP)" = .yes ]; then \
- (cd php && $(MAKE) $(MFLAGS) -f Makefile.local install EXTDIR=$(prefix)/lib/php PHP=$(PHP)); \
+ (cd php && $(MAKE) $(MFLAGS) -f Makefile.local install EXTDIR=$(prefix)/lib/php PHP=$(PHP) DESTDIR=$(DESTDIR)); \
fi
uninstall:
|
|
ossp-pkg/uuid/php/Makefile.local 1.1 -> 1.2
--- Makefile.local 2005/09/01 22:24:02 1.1
+++ Makefile.local 2005/09/02 14:40:13 1.2
@@ -27,8 +27,9 @@
## Makefile.local: PHP/Zend API build procedure (language: make)
##
-PHP = php
-EXTDIR = `$(PHP)-config --extension-dir`
+PHP = php
+EXTDIR = `$(PHP)-config --extension-dir`
+DESTDIR =
all: build
@@ -46,9 +47,9 @@
install: build
@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
echo "installing PHP$$version API into $$extdir"; \
- ./build/shtool mkdir -f -p -m 755 $$extdir; \
- ./build/shtool install -c -m 755 modules/uuid.so $$extdir/uuid.so; \
- ./build/shtool install -c -m 644 uuid.php$$version $$extdir/uuid.php
+ ./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \
+ ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \
+ ./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php
clean:
@$(MAKE) $(MFLAGS) -f Makefile clean || true
|
|
