From 6577a39babd7e171e40b8ef6893e99a66d96710d Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sat, 3 Nov 2007 20:20:03 +0000
Subject: [PATCH]   * merged into fpmake.pp

git-svn-id: trunk@9116 -
---
 .gitattributes           |  1 -
 packages/hash/fpmake.inc | 11 -----------
 packages/hash/fpmake.pp  | 22 +++++++++++++++++++---
 3 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 packages/hash/fpmake.inc

diff --git a/.gitattributes b/.gitattributes
index 5f03ee0211..5060c33e33 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4325,7 +4325,6 @@ packages/fpmkunit/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/src/fpmkunit.pp svneol=native#text/plain
 packages/hash/Makefile svneol=native#text/plain
 packages/hash/Makefile.fpc svneol=native#text/plain
-packages/hash/fpmake.inc svneol=native#text/plain
 packages/hash/fpmake.pp svneol=native#text/plain
 packages/hash/src/crc.pas svneol=native#text/plain
 packages/hash/src/md5.pp svneol=native#text/plain
diff --git a/packages/hash/fpmake.inc b/packages/hash/fpmake.inc
deleted file mode 100644
index 2448505144..0000000000
--- a/packages/hash/fpmake.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-    StartPackage('hash');
-    Version:='2.0.0';
-    T:=Targets.AddUnit('src/md5.pp');
-    T:=Targets.AddUnit('src/crc.pp');
-    T:=Targets.AddUnit('src/ntlm.pas');
-    T:=Targets.AddUnit('src/uuid.pas');
-    T:=Targets.AddUnit('src/unixcrypt.pas');
-    T.OS:=[Linux];
-    T:=Targets.AddExampleunit('tests/mdtest.pas');
-    EndPackage;
-
diff --git a/packages/hash/fpmake.pp b/packages/hash/fpmake.pp
index d4b6178682..e35017c2b4 100644
--- a/packages/hash/fpmake.pp
+++ b/packages/hash/fpmake.pp
@@ -1,3 +1,4 @@
+{$ifndef ALLPACKAGES}
 {$mode objfpc}{$H+}
 program fpmake;
 
@@ -9,9 +10,24 @@ Var
 begin
   With Installer do 
     begin
-    { Base packages }
-    {$i fpmake.inc}
+{$endif ALLPACKAGES}    
+
+    StartPackage('hash');
+{$ifdef ALLPACKAGES}
+    Directory:='hash';
+{$endif ALLPACKAGES}    
+    Version:='2.0.0';
+    T:=Targets.AddUnit('src/md5.pp');
+    T:=Targets.AddUnit('src/crc.pas');
+    T:=Targets.AddUnit('src/ntlm.pas');
+    T:=Targets.AddUnit('src/uuid.pas');
+    T:=Targets.AddUnit('src/unixcrypt.pas');
+    T.OS:=[Linux];
+    T:=Targets.AddExampleunit('tests/mdtest.pas');
+    EndPackage;
+    
+{$ifndef ALLPACKAGES}
     Run;
     end;
 end.
-
+{$endif ALLPACKAGES}