Commit 39c7b224a1ad48db7a05a8f58c336c602df32f19
1 parent
cd4baa46
Exists in
master
and in
3 other branches
Fixing win32 builds.
Showing
3 changed files
with
18 additions
and
4 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -144,8 +144,20 @@ doc: |
| 144 | 144 | |
| 145 | 145 | #---[ Install Targets ]------------------------------------------------------------------ |
| 146 | 146 | |
| 147 | -install: | |
| 147 | +install: \ | |
| 148 | + install-shared \ | |
| 149 | + install-static \ | |
| 150 | + install-dev | |
| 148 | 151 | |
| 152 | +install-shared: | |
| 153 | + $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270 $@ | |
| 154 | + $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270++ $@ | |
| 155 | + | |
| 156 | +install-static: | |
| 157 | + $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270 $@ | |
| 158 | + $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270++ $@ | |
| 159 | + | |
| 160 | +install-dev: | |
| 149 | 161 | $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270 $@ |
| 150 | 162 | $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270++ $@ |
| 151 | 163 | ... | ... |
src/lib3270++/Makefile.in
| ... | ... | @@ -248,9 +248,10 @@ install-static: \ |
| 248 | 248 | $(BINRLS)/static/$(LIBNAME).a |
| 249 | 249 | |
| 250 | 250 | # Install static library |
| 251 | + @mkdir -p $(DESTDIR)$(libdir) | |
| 251 | 252 | @$(INSTALL_DATA) \ |
| 252 | 253 | $(BINRLS)/static/$(LIBNAME).a \ |
| 253 | - $(DESTDIR)$(libdir) | |
| 254 | + $(DESTDIR)$(libdir)/$(LIBNAME)static.a | |
| 254 | 255 | |
| 255 | 256 | install-dev: |
| 256 | 257 | ... | ... |
src/lib3270/Makefile.in
| ... | ... | @@ -243,9 +243,10 @@ install-static: \ |
| 243 | 243 | $(BINRLS)/static/$(LIBNAME).a |
| 244 | 244 | |
| 245 | 245 | # Install static library |
| 246 | - @$(INSTALL_DATA) \ | |
| 246 | + mkdir -p $(DESTDIR)$(libdir) | |
| 247 | + $(INSTALL_DATA) \ | |
| 247 | 248 | $(BINRLS)/static/$(LIBNAME).a \ |
| 248 | - $(DESTDIR)$(libdir) | |
| 249 | + $(DESTDIR)$(libdir)/$(LIBNAME)-static.a | |
| 249 | 250 | |
| 250 | 251 | |
| 251 | 252 | install-dev: | ... | ... |