diff options
| author | Karl MacMillan <kmacmill@redhat.com> | 2007-09-28 16:46:08 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmill@redhat.com> | 2007-09-28 16:46:08 -0400 |
| commit | 50d12d6d2e680d32a5940afa0242c2c75df57d1f (patch) | |
| tree | 01e693e4037a5d3dfcdfdf8b8831f37dbdaba57b /ipa-server/ipa-install | |
| parent | 22710a8dce6700cfd3c991d9c0e5425fc7bdea5e (diff) | |
| download | freeipa-50d12d6d2e680d32a5940afa0242c2c75df57d1f.tar.gz freeipa-50d12d6d2e680d32a5940afa0242c2c75df57d1f.tar.xz freeipa-50d12d6d2e680d32a5940afa0242c2c75df57d1f.zip | |
Misc small fixes
* Remove the rpmbuild tree with the dist-clean target.
* Move ipa-server-setupssl from /usr/sbin to /usr/share/ipa
* Check in requirement change for generated freeipa-python.spec
* Fix interactive hostname in ipa-server-install.
Diffstat (limited to 'ipa-server/ipa-install')
| -rw-r--r-- | ipa-server/ipa-install/Makefile | 3 | ||||
| -rw-r--r-- | ipa-server/ipa-install/ipa-server-install | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ipa-server/ipa-install/Makefile b/ipa-server/ipa-install/Makefile index 2524baf31..40a39b576 100644 --- a/ipa-server/ipa-install/Makefile +++ b/ipa-server/ipa-install/Makefile @@ -1,3 +1,4 @@ +SHAREDIR=$(DESTDIR)/usr/share/ipa SBINDIR=$(DESTDIR)/usr/sbin all: ; @@ -5,7 +6,7 @@ all: ; install: -mkdir $(SBINDIR) install -m 755 ipa-server-install $(SBINDIR) - install -m 755 ipa-server-setupssl $(SBINDIR) + install -m 755 ipa-server-setupssl $(SHAREDIR) $(MAKE) -C share $@ $(MAKE) -C test $@ diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index d4e55302b..54da6856b 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -134,7 +134,7 @@ def main(): if host_name == "": print "" host_name = raw_input("Please provide a Fully Qualified name to use for your system [master.example.com]: ") - if host_name != "": + if host_name == "": host_name = "master.example.com" if len(host_name.split(".")) < 2 or host_name == "localhost.localdomain": |