- prepared Makefile to make creating new releases easier. Do (finally!!)

  compilation of joinpasswd - we should consider start using it.
- killed pld.org.pl in joinpasswd source

Changed files:
    Makefile -> 1.1
    joinpasswd.c -> 1.7

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..971b022
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,57 @@
+# Very basic and very simple Makefile. Maybe it would be nice to make it
+# in ac/am.... but I'm too lazy ;)
+# 
+VERSION                = 2.4.3
+
+CC             = gcc
+OPT_FLAGS      = -O2 -g
+CFLAGS         = $(OPT_FLAGS) -Wall
+INSTALL                = install
+SBINDIR                = /sbin
+ETCDIR         = /etc
+PROFILEDIR     = $(ETCDIR)/profil.d
+#########################################
+
+BIN_FILES      = joinpasswd
+DOCS           = ChangeLog
+ETC_FILES      = filesystems fstab group host.conf hosts motd mtab \
+           netgroup passwd profile protocols resolv.conf securetty \
+           services shells
+PROFILE_FILES  = tmp-dir.csh tmp-dir.sh
+
+SOURCES                = joinpasswd.c
+CLEAN          = $(BIN_FILES) *.o core *.tar.gz *.tar.bz2 *~ *.swp
+
+#########################################
+all: joinpasswd
+
+joinpasswd: joinpasswd.o
+
+.c.o:
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(CDEFS) -c $< -o $@
+
+clean:
+       rm -f $(CLEAN)
+       cd etc; rm -f $(CLEAN)
+       cd etc/profile.d; rm -f $(CLEAN)
+
+install:
+       $(INSTALL) -d $(DESTDIR)/$(SBINDIR)
+       $(INSTALL) -d $(DESTDIR)/$(ETCDIR)
+       $(INSTALL) -d $(DESTDIR)/$(PROFILEDIR)
+       $(INSTALL) $(BIN_FILES) $(DESTDIR)/$(SBINDIR)
+       cd etc; $(INSTALL) $(ETC_FILES) $(DESTDIR)/$(ETCDIR)
+       cd etc/profile.d; $(INSTALL) $(PROFILE_FILES) $(DESTDIR)/$(PROFILEDIR)
+
+dist: clean
+       
+       $(INSTALL) -d setup-$(VERSION)/etc/profile.d
+       $(INSTALL) $(DOCS) $(SOURCES) setup-$(VERSION)
+       for file in $(ETC_FILES); do \
+               $(INSTALL) etc/$$file setup-$(VERSION)/etc; \
+       done
+       for file in $(PROFILE_FILES); do \
+               $(INSTALL) etc/profile.d/$$file setup-$(VERSION)/etc/profile.d; \
+       done
+       tar -cvjf setup-$(VERSION).tar.bz2 setup-$(VERSION)
+       rm -rf setup-$(VERSION)

diff --git a/joinpasswd.c b/joinpasswd.c
index f84ab975649de4c6b88284734121e4670c414aa7..23985076464a4a9b79761be32e53dd44b0f96699 100644 (file)
--- a/joinpasswd.c
+++ b/joinpasswd.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  * 
- * Copyright (c) 2001 Michal Moskal <malekith@pld.org.pl>.
+ * Copyright (c) 2001 Michal Moskal <malekith@pld-linux.org>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
  * 20000 users in system database on Pentium class machine. After static link
  * against uClibc it is under 2k on x86. Stdio hasn't been used intentionally.
  * 
- * Written for PLD Linux (http://www.pld.org.pl) setup package.
+ * Written for PLD Linux (http://www.pld-linux.org/) setup package.
  *
  * Compilation against uClibc:
  * UCROOT=/usr/lib/bootdisk/usr
@@ -53,7 +53,7 @@
  *             $UCROOT/lib/libc.a -lgcc -o joinpasswd
  * strip -R .comment -R .note joinpasswd
  *
- * The idea of this program comes from Lukasz Dobrek <dobrek@pld.org.pl>.
+ * The idea of this program comes from Lukasz Dobrek <dobrek@pld-linux.org>.
  * 
  */