diff options
| author | dreid <dreid@13f79535-47bb-0310-9956-ffa450edef68> | 2001-07-27 10:22:04 +0000 |
|---|---|---|
| committer | dreid <dreid@13f79535-47bb-0310-9956-ffa450edef68> | 2001-07-27 10:22:04 +0000 |
| commit | e833bf7fafcb1c9356ed56e4521453b5030c7b63 (patch) | |
| tree | cb49e066ea369e727901b0a4250b2ddfa3c2aa87 /Makefile.in | |
| parent | f88e3b2855424f0ae8d3c82f60ac84ac08800b7b (diff) | |
| download | libapr-e833bf7fafcb1c9356ed56e4521453b5030c7b63.tar.gz | |
Neither beos or OS/2 has any subdirs that need installing, so the commit
that added INSTALL_SUBDIRS broke the build. I couldn't find a way of getting
it to work with an empty INSTALL_SUBDIRS (others may be able to) so I
opted for setting it initially to 'none' and then testing for that when
come to make install.
This gets make install working again but was only tested on beos. Other
platforms shouldn't be affected, but please test.
Brian, does this work for OS/2?
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62045 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index cbcb1a472..487953797 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,9 +61,11 @@ install: $(TARGET_LIB) fi; \ $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir) $(LIBTOOL) --mode=install cp APRVARS $(libdir) - @for i in $(INSTALL_SUBDIRS); do \ - ( cd $$i ; $(MAKE) install ); \ - done + @if [ $(INSTALL_SUBDIRS) != "none" ]; then \ + for i in $(INSTALL_SUBDIRS); do \ + ( cd $$i ; $(MAKE) install ); \ + done \ + fi $(TARGET_LIB): @for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \ |