diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-12-21 13:53:48 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-12-21 13:53:48 +0000 |
| commit | 903b7bb41df80e643be7e2a8ef150f3e1448ea6c (patch) | |
| tree | db7351b7eec76faad71f8b4a4f8ffcff16927a48 /cpp | |
| parent | Making bzip2 readme more appropriate for public consumption (diff) | |
| download | ice-903b7bb41df80e643be7e2a8ef150f3e1448ea6c.tar.bz2 ice-903b7bb41df80e643be7e2a8ef150f3e1448ea6c.tar.xz ice-903b7bb41df80e643be7e2a8ef150f3e1448ea6c.zip | |
adding an install rule for files in the config directory
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Makefile | 2 | ||||
| -rw-r--r-- | cpp/config/Make.rules | 2 | ||||
| -rw-r--r-- | cpp/config/Makefile | 25 |
3 files changed, 27 insertions, 2 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 6e9299307b0..dc687c86558 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -11,7 +11,7 @@ top_srcdir = . include $(top_srcdir)/config/Make.rules -SUBDIRS = src include test demo slice +SUBDIRS = config src include test demo slice INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir) diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 66f94f7c45b..93153684c03 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -12,7 +12,7 @@ # if it does not exist. # -prefix = /opt/Ice-$(VERSION) +prefix ?= /opt/Ice-$(VERSION) # # Define OPTIMIZE as yes if you want to build with diff --git a/cpp/config/Makefile b/cpp/config/Makefile new file mode 100644 index 00000000000..41a67902832 --- /dev/null +++ b/cpp/config/Makefile @@ -0,0 +1,25 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +top_srcdir = .. + +include $(top_srcdir)/config/Make.rules + +all:: + echo "" + +install:: + @if test ! -d $(prefix)/config ; \ + then \ + echo "Creating $(prefix)/config..." ; \ + $(call mkdir,$(prefix)/config) ; \ + fi + $(call installdata,Make.rules,$(prefix)/config) + $(call installdata,Make.rules.$(UNAME),$(prefix)/config) + $(call installdata,templates.xml,$(prefix)/config) |